Author: cazfi Date: Fri Jul 29 10:09:30 2016 New Revision: 33369 URL: http://svn.gna.org/viewcvs/freeciv?rev=33369&view=rev Log: Consistently use '\' as directory separator in crosser based builds.
See bug #24884 Modified: branches/S2_6/configure.ac branches/S2_6/utility/shared.h Modified: branches/S2_6/configure.ac URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=33369&r1=33368&r2=33369&view=diff ============================================================================== --- branches/S2_6/configure.ac (original) +++ branches/S2_6/configure.ac Fri Jul 29 10:09:30 2016 @@ -815,7 +815,6 @@ AS_HELP_STRING([--enable-crosser], [build version to be used with crosser environment]), [case "${enableval}" in yes) crosser=yes - HOST_DIR_SEPARATOR="/" AC_DEFINE([CROSSER], [1], [this is crosser based build]) ;; no) crosser=no ;; *) AC_MSG_ERROR([bad value ${enableval} for --enable-crosser]) ;; Modified: branches/S2_6/utility/shared.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/shared.h?rev=33369&r1=33368&r2=33369&view=diff ============================================================================== --- branches/S2_6/utility/shared.h (original) +++ branches/S2_6/utility/shared.h Fri Jul 29 10:09:30 2016 @@ -118,13 +118,7 @@ #endif #endif /* PATH_SEPARATOR */ -#ifndef DIR_SEPARATOR -#if defined(CROSSER) - /* crosser based build */ -# define DIR_SEPARATOR_IS_DEFAULT -# define DIR_SEPARATOR "/" -# define DIR_SEPARATOR_CHAR '/' -#elif defined(FREECIV_MSWINDOWS) || defined(_WIN32) || defined(__WIN32__) || defined(__EMX__) || defined(__DJGPP__) +#if defined(FREECIV_MSWINDOWS) || defined(_WIN32) || defined(__WIN32__) || defined(__EMX__) || defined(__DJGPP__) /* Win32, OS/2, DOS */ # define DIR_SEPARATOR "\\" # define DIR_SEPARATOR_CHAR '\\' @@ -134,7 +128,6 @@ # define DIR_SEPARATOR "/" # define DIR_SEPARATOR_CHAR '/' #endif -#endif /* DIR_SEPARATOR */ #define PARENT_DIR_OPERATOR ".." _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits