Merge branch 'master' into threading

[xonotic/gmqcc.git] / platform.h

diff --git a/platform.h b/platform.h
index 27abc644fc5b7eb23f3cbf4bef376b7fc253b1ae..50b119a6beb12c0ecc3d739dec673397ed78c898 100644 (file)
--- a/platform.h
+++ b/platform.h
@@ -60,14 +60,13 @@
             int                dd_stat;
             char               dd_name[1];
         } DIR;
-
-#       ifdef S_ISDIR
-#           undef  S_ISDIR
-#       endif /*! S_ISDIR */
-#       define S_ISDIR(X) ((X)&_S_IFDIR)
 #   else
 #       include <dirent.h>
 #   endif /*!__MINGW32__*/
+
+#   ifndef S_ISDIR
+#       define S_ISDIR(X) ((X)&_S_IFDIR)
+#   endif
 #else
 #   include <sys/types.h>
 #   include <sys/stat.h>
@@ -217,7 +216,7 @@ const char *platform_tmpnam(char *str);
  *  pointer. The return value is *NULL* if `var` is not found in the
  *  enviroment table.
  */
-const char *platform_getenv(char *var);
+const char *platform_getenv(const char *var);
 
 /*
  * Function: platform_vasprintf