Kaynağa Gözat

Use physfs_platforms.h in physfs_internal.h, to avoid repeated macro tests.

Ryan C. Gordon 14 yıl önce
ebeveyn
işleme
82a6ce0abf
1 değiştirilmiş dosya ile 4 ekleme ve 2 silme
  1. 4 2
      src/physfs_internal.h

+ 4 - 2
src/physfs_internal.h

@@ -21,6 +21,8 @@
 #include <stdlib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <string.h>
 
 
+#include "physfs_platforms.h"
+
 #ifdef HAVE_ASSERT_H
 #ifdef HAVE_ASSERT_H
 #include <assert.h>
 #include <assert.h>
 #elif (!defined assert)
 #elif (!defined assert)
@@ -55,7 +57,7 @@ extern "C" {
 #   define inline __inline
 #   define inline __inline
 #endif
 #endif
 
 
-#if defined(__linux__) && !defined(_FILE_OFFSET_BITS)
+#if PHYSFS_PLATFORM_LINUX && !defined(_FILE_OFFSET_BITS)
 #define _FILE_OFFSET_BITS 64
 #define _FILE_OFFSET_BITS 64
 #endif
 #endif
 
 
@@ -1039,7 +1041,7 @@ int UNPK_stat(dvoid *opaque, const char *fn, int *exists, PHYSFS_Stat *stat);
  *  Obviously, this isn't a function. If you need more than one char for this,
  *  Obviously, this isn't a function. If you need more than one char for this,
  *  you'll need to pull some old pieces of PhysicsFS out of revision control.
  *  you'll need to pull some old pieces of PhysicsFS out of revision control.
  */
  */
-#if (((defined _WIN32) || (defined _WIN64)) && (!defined __CYGWIN__))
+#if PHYSFS_PLATFORM_WINDOWS
 #define __PHYSFS_platformDirSeparator '\\'
 #define __PHYSFS_platformDirSeparator '\\'
 #else
 #else
 #define __PHYSFS_platformDirSeparator '/'
 #define __PHYSFS_platformDirSeparator '/'