mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added missing defined() in #elif

Browse Source 
gcc >= 4.4 requires a condition in #elif.
This commit is contained in:
Bernhard Miklautz 2013-01-25 17:50:40 +01:00
parent 36c8f8e9c2
commit f91b88f714
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libfreerdp/locale/timezone.c
View File

@ -1665,7 +1665,7 @@ void freerdp_time_zone_detect(TIME_ZONE_INFO* clientTimeZone)
clientTimeZone->bias = (UINT32) (local_time->tm_gmtoff / 60); clientTimeZone->bias = (UINT32) (local_time->tm_gmtoff / 60);
else else
clientTimeZone->bias = (UINT32) (1440 + (INT32) (local_time->tm_gmtoff / 60)); clientTimeZone->bias = (UINT32) (1440 + (INT32) (local_time->tm_gmtoff / 60));
#elif sun #elif defined(sun)
if (local_time->tm_isdst > 0) if (local_time->tm_isdst > 0)
clientTimeZone->bias = (UINT32) (altzone / 3600); clientTimeZone->bias = (UINT32) (altzone / 3600);
else else

2
libfreerdp/primitives/prim_colors.c
View File

@ -26,7 +26,7 @@
#include <freerdp/primitives.h> #include <freerdp/primitives.h>
#ifdef WITH_SSE2 #ifdef WITH_SSE2
#include <emmintrin.h> #include <emmintrin.h>
#elif WITH_NEON #elif defined(WITH_NEON)
#include <arm_neon.h> #include <arm_neon.h>
#endif /* WITH_SSE2 else WITH_NEON */ #endif /* WITH_SSE2 else WITH_NEON */
#include "prim_internal.h" #include "prim_internal.h"

2
libfreerdp/utils/file.c
View File

@ -54,7 +54,7 @@
#ifdef _WIN32 #ifdef _WIN32
#define SHARED_LIB_SUFFIX ".dll" #define SHARED_LIB_SUFFIX ".dll"
#elif __APPLE__ #elif defined(__APPLE__)
#define SHARED_LIB_SUFFIX ".dylib" #define SHARED_LIB_SUFFIX ".dylib"
#else #else
#define SHARED_LIB_SUFFIX ".so" #define SHARED_LIB_SUFFIX ".so"

2
libfreerdp/utils/passphrase.c
View File

@ -32,7 +32,7 @@ char* freerdp_passphrase_read(const char* prompt, char* buf, size_t bufsiz, int
return NULL; return NULL;
} }
#elif (!ANDROID) #elif !defined(ANDROID)
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>

2
libfreerdp/utils/signal.c
View File

@ -37,7 +37,7 @@ int freerdp_handle_signals(void)
return -1; return -1;
} }
#elif (!ANDROID) #elif !defined(ANDROID)
volatile sig_atomic_t terminal_needs_reset = 0; volatile sig_atomic_t terminal_needs_reset = 0;
int terminal_fildes = 0; int terminal_fildes = 0;

10
winpr/libwinpr/path/path.c
View File

@ -57,7 +57,7 @@
#ifdef _WIN32 #ifdef _WIN32
#define SHARED_LIBRARY_EXT SHARED_LIBRARY_EXT_DLL #define SHARED_LIBRARY_EXT SHARED_LIBRARY_EXT_DLL
#elif __APPLE__ #elif defined(__APPLE__)
#define SHARED_LIBRARY_EXT SHARED_LIBRARY_EXT_DYLIB #define SHARED_LIBRARY_EXT SHARED_LIBRARY_EXT_DYLIB
#else #else
#define SHARED_LIBRARY_EXT SHARED_LIBRARY_EXT_SO #define SHARED_LIBRARY_EXT SHARED_LIBRARY_EXT_SO
@ -881,7 +881,7 @@ PCSTR PathGetSharedLibraryExtensionA(unsigned long dwFlags)
{ {
#ifdef _WIN32 #ifdef _WIN32
return SharedLibraryExtensionDotDllA; return SharedLibraryExtensionDotDllA;
#elif __APPLE__ #elif defined(__APPLE__)
if (dwFlags & PATH_SHARED_LIB_EXT_APPLE_SO) if (dwFlags & PATH_SHARED_LIB_EXT_APPLE_SO)
return SharedLibraryExtensionDotSoA; return SharedLibraryExtensionDotSoA;
else else
@ -894,7 +894,7 @@ PCSTR PathGetSharedLibraryExtensionA(unsigned long dwFlags)
{ {
#ifdef _WIN32 #ifdef _WIN32
return SharedLibraryExtensionDllA; return SharedLibraryExtensionDllA;
#elif __APPLE__ #elif defined(__APPLE__)
if (dwFlags & PATH_SHARED_LIB_EXT_APPLE_SO) if (dwFlags & PATH_SHARED_LIB_EXT_APPLE_SO)
return SharedLibraryExtensionSoA; return SharedLibraryExtensionSoA;
else else
@ -939,7 +939,7 @@ PCWSTR PathGetSharedLibraryExtensionW(unsigned long dwFlags)
{ {
#ifdef _WIN32 #ifdef _WIN32
return SharedLibraryExtensionDotDllW; return SharedLibraryExtensionDotDllW;
#elif __APPLE__ #elif defined(__APPLE__)
if (dwFlags & PATH_SHARED_LIB_EXT_APPLE_SO) if (dwFlags & PATH_SHARED_LIB_EXT_APPLE_SO)
return SharedLibraryExtensionDotSoW; return SharedLibraryExtensionDotSoW;
else else
@ -952,7 +952,7 @@ PCWSTR PathGetSharedLibraryExtensionW(unsigned long dwFlags)
{ {
#ifdef _WIN32 #ifdef _WIN32
return SharedLibraryExtensionDllW; return SharedLibraryExtensionDllW;
#elif __APPLE__ #elif defined(__APPLE__)
if (dwFlags & PATH_SHARED_LIB_EXT_APPLE_SO) if (dwFlags & PATH_SHARED_LIB_EXT_APPLE_SO)
return SharedLibraryExtensionSoW; return SharedLibraryExtensionSoW;
else else