kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Haiku: Remove outdated preprocessor checks 

* Haiku does not define __BEOS__ anymore, so there is no need to guard
  these BeOS specific workaround for Haiku.
* The workaround themselves are not needed for Haiku as it has much
  better POSIX compatibility than BeOS did.

Applied-by: Rolf Eike Beer <eike@sf-mail.de>
This commit is contained in:
Adrien Destugues 2013-10-05 16:33:52 +02:00 committed by Brad King
parent 1dc61f8142
commit 38d555537c
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Utilities/cmcurl/CMake/CurlTests.c
View File

@ -38,7 +38,7 @@ main ()
# define PLATFORM_AIX_V3
#endif
#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__))
#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__)
#error "O_NONBLOCK does not work on this platform"
#endif
int socket;

2
Utilities/cmcurl/select.c
View File

@ -39,7 +39,7 @@
#error "We can't compile without select() support!"
#endif
#if defined(__BEOS__) && !defined(__HAIKU__)
#if defined(__BEOS__)
/* BeOS has FD_SET defined in socket.h */
#include <socket.h>
#endif

2
Utilities/cmzlib/zconf.h
View File

@ -237,7 +237,7 @@
# endif
#endif
#if defined (__BEOS__) && !defined (__HAIKU__)
#if defined (__BEOS__)
# ifdef ZLIB_DLL
# ifdef ZLIB_INTERNAL
# define ZEXPORT __declspec(dllexport)

6
Utilities/cmzlib/zutil.h
View File

@ -147,12 +147,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
# define OS_CODE 0x0f
#endif
/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */
/* many BeOS workarounds are no longer needed in Haiku */
#if defined(__HAIKU__) && defined(__BEOS__)
#undef __BEOS__
#endif
#if defined(_BEOS_) || defined(RISCOS)
# define fdopen(fd,mode) NULL /* No fdopen() */
#endif