From c7a99c2e030d475a511208d04bac3c80676c67f3 Mon Sep 17 00:00:00 2001 From: "ludovic.rousseau" Date: Fri, 30 Jul 2010 07:09:15 +0000 Subject: [PATCH] Use || instead of | in a #if check git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4619 c6295689-39f2-0310-b995-f0e70906c6a9 --- src/libopensc/internal-winscard.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libopensc/internal-winscard.h b/src/libopensc/internal-winscard.h index 160f8aed..0c99d715 100644 --- a/src/libopensc/internal-winscard.h +++ b/src/libopensc/internal-winscard.h @@ -172,7 +172,7 @@ typedef LONG (PCSC_API *SCardGetAttrib_t)(SCARDHANDLE hCard, DWORD dwAttrId,\ /* Set structure elements aligment on bytes * http://gcc.gnu.org/onlinedocs/gcc/Structure_002dPacking-Pragmas.html */ -#if defined(__APPLE__) | defined(sun) +#if defined(__APPLE__) || defined(sun) #pragma pack(1) #else #pragma pack(push, 1) @@ -268,7 +268,7 @@ typedef struct { } PIN_PROPERTIES_STRUCTURE; /* restore default structure elements alignment */ -#if defined(__APPLE__) | defined(sun) +#if defined(__APPLE__) || defined(sun) #pragma pack() #else #pragma pack(pop)