Patchset fix (#2958)

This commit is contained in:
miqlas
2018-08-26 18:08:15 +02:00
committed by waddlesplash
parent 225a26e0a9
commit 7e79d7c949

View File

@@ -19,18 +19,20 @@ index fcd494b..6808812 100644
SET(LIB_POSTFIX "64" CACHE STRING "suffix for 32/64 dir placement")
MARK_AS_ADVANCED(LIB_POSTFIX)
diff --git a/src/osgDB/FileUtils.cpp b/src/osgDB/FileUtils.cpp
index 5a13fed..a7ce945 100644
index f76ec4f..5b8973c 100644
--- a/src/osgDB/FileUtils.cpp
+++ b/src/osgDB/FileUtils.cpp
@@ -80,7 +80,7 @@ typedef char TCHAR;
@@ -80,8 +80,8 @@ typedef char TCHAR;
#if (MAC_OS_X_VERSION_MAX_ALLOWED <= 1040)
#define stat64 stat
#endif
-#elif defined(__CYGWIN__) || define(__HAIKU__) || defined(__FreeBSD__) || defined(__DragonFly__) || \
+#elif defined(__CYGWIN__) || defined(__HAIKU__) || defined(__FreeBSD__) || defined(__DragonFly__) || \
(defined(__hpux) && !defined(_LARGEFILE64_SOURCE))
-#elif defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__DragonFly__) || \
- (defined(__hpux) && !defined(_LARGEFILE64_SOURCE))
+#elif defined(__CYGWIN__) || defined(__HAIKU__) || defined(__FreeBSD__) || \
+ defined(__DragonFly__) || (defined(__hpux) && !defined(_LARGEFILE64_SOURCE))
#define stat64 stat
#endif
diff --git a/src/osgPlugins/osc/osc/OscHostEndianness.h b/src/osgPlugins/osc/osc/OscHostEndianness.h
index fe135f4..680fcfe 100644
--- a/src/osgPlugins/osc/osc/OscHostEndianness.h
@@ -45,5 +47,5 @@ index fe135f4..680fcfe 100644
#if (__BYTE_ORDER == __LITTLE_ENDIAN)
#ifndef __LITTLE_ENDIAN__
--
2.16.2
2.16.4