Author: cazfi
Date: Wed May 4 20:38:11 2016
New Revision: 32581
URL: http://svn.gna.org/viewcvs/freeciv?rev=32581&view=rev
Log:
Replaced use of WIN32_NATIVE with public FREECIV_MS_WINDOWS in shared.h header
See bug #24635
Modified:
trunk/utility/shared.h
Modified: trunk/utility/shared.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/utility/shared.h?rev=32581&r1=32580&r2=32581&view=diff
==============================================================================
--- trunk/utility/shared.h (original)
+++ trunk/utility/shared.h Wed May 4 20:38:11 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/***********************************************************************
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -16,6 +16,8 @@
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
+
+#include <freeciv_config.h>
#include <stdlib.h> /* size_t */
#include <string.h> /* memset */
@@ -106,7 +108,7 @@
}
#ifndef PATH_SEPARATOR
-#if defined(WIN32_NATIVE) || defined(_WIN32) || defined(__WIN32__) ||
defined(__EMX__) || defined(__DJGPP__)
+#if defined(FREECIV_MS_WINDOWS) || defined(_WIN32) || defined(__WIN32__) ||
defined(__EMX__) || defined(__DJGPP__)
/* Win32, OS/2, DOS */
# define PATH_SEPARATOR ";"
#else
@@ -116,7 +118,7 @@
#endif /* PATH_SEPARATOR */
#ifndef DIR_SEPARATOR
-#if defined(WIN32_NATIVE) || defined(_WIN32) || defined(__WIN32__) ||
defined(__EMX__) || defined(__DJGPP__)
+#if defined(FREECIV_MS_WINDOWS) || defined(_WIN32) || defined(__WIN32__) ||
defined(__EMX__) || defined(__DJGPP__)
/* Win32, OS/2, DOS */
# define DIR_SEPARATOR "\\"
# define DIR_SEPARATOR_CHAR '\\'
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
