Commit 23d8a5db authored by Bill Hoffman's avatar Bill Hoffman
Browse files

ENH: merge in the rest of the haiku changes

parent 4146e08a
......@@ -354,7 +354,7 @@ ENDMACRO (CMAKE_BUILD_UTILITIES)
SET(CMake_VERSION_MAJOR 2)
SET(CMake_VERSION_MINOR 6)
SET(CMake_VERSION_PATCH 3)
SET(CMake_VERSION_RC 1)
SET(CMake_VERSION_RC 2)
# CVS versions are odd, if this is an odd minor version
# then set the CMake_VERSION_DATE variable
IF("${CMake_VERSION_MINOR}" MATCHES "[13579]$")
......
Changes in CMake 2.6.3 RC 2
- Merge in more Haiku changes
Changes in CMake 2.6.3 RC 1
- Better reporting when nmake compiler environment is not correct
- Fix bug #5936 set locale when running cvs and svn
......@@ -32,6 +34,8 @@ Changes in CMake 2.6.3 RC 1
- Fix NSIS detection on windows 2000
- Display an error message in ccmake when there are errors
CMake 2.6.2 released
Changes in CMake 2.6.2 RC 6
- Fix bug#7669 cpack did not work when sym-linked after install
......
......@@ -38,7 +38,7 @@ main ()
# define PLATFORM_AIX_V3
#endif
#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__)
#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__))
#error "O_NONBLOCK does not work on this platform"
#endif
int socket;
......
......@@ -1133,7 +1133,7 @@ typedef enum {
}
#endif
#ifdef __BEOS__
#if defined __BEOS__ || defined __HAIKU__
#include <support/SupportDefs.h>
#endif
......
......@@ -39,7 +39,7 @@
#error "We can't compile without select() support!"
#endif
#ifdef __BEOS__
#if defined(__BEOS__) && !defined(__HAIKU__)
/* BeOS has FD_SET defined in socket.h */
#include <socket.h>
#endif
......
......@@ -110,6 +110,13 @@ mkdirhier(char *path)
if (dst[0] != '\0')
strcat(dst, "/");
strcat(dst, dirp);
#if defined(_WIN32)
/* On some Windows machine, trying to mkdir("C:") would fail miserably */
if (dst[strlen(dst) - 1] == ':')
continue;
#endif
if (
#if defined(_WIN32) && !defined(__CYGWIN__)
mkdir(dst) == -1
......
......@@ -237,7 +237,7 @@
# endif
#endif
#if defined (__BEOS__)
#if defined (__BEOS__) && !defined (__HAIKU__)
# ifdef ZLIB_DLL
# ifdef ZLIB_INTERNAL
# define ZEXPORT __declspec(dllexport)
......
......@@ -147,7 +147,13 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
# define OS_CODE 0x0f
#endif
#if defined(_BEOS_) || defined(RISCOS)
/* 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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment