From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 24 Jun 2010 14:51:45 +0000 (+0000)
Subject: Use _XBT_WIN32 against _WIN32.
X-Git-Tag: v3_5~877
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/ffc2602db539b0dbc1978f01028693579ecd2b9d?hp=e93bd4b841fecdf461434ee45a7dd58e62e4d5b1

Use _XBT_WIN32 against _WIN32.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7935 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/buildtools/Cmake/MaintainerMode.cmake b/buildtools/Cmake/MaintainerMode.cmake
index 35cfc04437..a64f8caea4 100644
--- a/buildtools/Cmake/MaintainerMode.cmake
+++ b/buildtools/Cmake/MaintainerMode.cmake
@@ -61,18 +61,24 @@ exec_program("${SED_EXE} ${CHAINE} -i src/simdag/dax_dtd.h" "${PROJECT_DIRECTORY
 exec_program("${FLEX_EXE} -o src/gras/DataDesc/ddt_parse.yy.c -Pgras_ddt_parse_ --noline src/gras/DataDesc/ddt_parse.yy.l" "${PROJECT_DIRECTORY}")
 
 #surf/simgrid_dtd.c: surf/simgrid_dtd.l
+set(CHAINE "'s/#if defined(_WIN32)/#if defined(_XBT_WIN32)/g' -i src/surf/simgrid_dtd.l")	
+exec_program("${SED_EXE} ${CHAINE}" "${PROJECT_DIRECTORY}")
 exec_program("${CMAKE_COMMAND} -E make_directory ${PROJECT_DIRECTORY}/src/surf")
 exec_program("${FLEX_EXE} -o src/surf/simgrid_dtd.c -Psurf_parse_ --noline src/surf/simgrid_dtd.l" "${PROJECT_DIRECTORY}/")
 set(CHAINE "'s/#include <unistd.h>/#if defined(_XBT_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\\n#  ifndef __STRICT_ANSI__\\n#    include <io.h>\\n#    include <process.h>\\n#  endif\\n#else\\n#  include <unistd.h>\\n#endif/g' -i src/surf/simgrid_dtd.c")	
 exec_program("${SED_EXE} ${CHAINE}" "${PROJECT_DIRECTORY}")
 
 #xbt/graphxml.c: xbt/graphxml.l
+set(CHAINE "'s/#if defined(_WIN32)/#if defined(_XBT_WIN32)/g' -i src/xbt/graphxml.l")	
+exec_program("${SED_EXE} ${CHAINE}" "${PROJECT_DIRECTORY}")
 exec_program("${CMAKE_COMMAND} -E make_directory ${PROJECT_DIRECTORY}/src/xbt")
 exec_program("${FLEX_EXE} -o src/xbt/graphxml.c -Pxbt_graph_parse_ --noline src/xbt/graphxml.l" "${PROJECT_DIRECTORY}")
 set(CHAINE "'s/#include <unistd.h>/#if defined(_XBT_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\\n#  ifndef __STRICT_ANSI__\\n#    include <io.h>\\n#    include <process.h>\\n#  endif\\n#else\\n#  include <unistd.h>\\n#endif/g' -i src/xbt/graphxml.c")			
 exec_program("${SED_EXE} ${CHAINE}" "${PROJECT_DIRECTORY}")
 
 #simdag/dax_dtd.c: simdag/dax_dtd.l
+set(CHAINE "'s/#if defined(_WIN32)/#if defined(_XBT_WIN32)/g' -i src/simdag/dax_dtd.l")	
+exec_program("${SED_EXE} ${CHAINE}" "${PROJECT_DIRECTORY}")
 exec_program("${CMAKE_COMMAND} -E make_directory ${PROJECT_DIRECTORY}/src/simdag")
 exec_program("${FLEX_EXE} -o src/simdag/dax_dtd.c -Pdax_ --noline src/simdag/dax_dtd.l" "${PROJECT_DIRECTORY}")
 set(CHAINE "'s/#include <unistd.h>/#if defined(_XBT_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\\n#  ifndef __STRICT_ANSI__\\n#    include <io.h>\\n#    include <process.h>\\n#  endif\\n#else\\n#  include <unistd.h>\\n#endif/g' -i src/simdag/dax_dtd.c")