X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9fc587b7c117eaf1e706e623597a4c1ade1c93d9..553f377a24c4530332edc5df6e99dab3ab082529:/src/win32/platform/select_platform_features.h

diff --git a/src/win32/platform/select_platform_features.h b/src/win32/platform/select_platform_features.h
index 406fcf3946..da9a167e51 100644
--- a/src/win32/platform/select_platform_features.h
+++ b/src/win32/platform/select_platform_features.h
@@ -4,7 +4,8 @@
 
 /* select_platform_features.h - platform features selection    */
 
-/* Copyright (c) 2003, 2004 Cherier Malek. All rights reserved.            */
+/* Copyright (c) 2006, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -13,58 +14,64 @@
 
 
 /* 
- * win32 or win64 (__WIN32 is defined for win32 and win64 applications, __TOS_WIN__ is defined by xlC).	
-*/ 
+ * win32 or win64 (__XBT_WIN32 is defined for win32 and win64 applications, __TOS_WIN__ is defined by xlC).
+*/
 
 /* If the platform is not resolved _XBT_PLATFORM_ID is set to zero. */
 #define _XBT_PLATFORM_ID 		0
 
 
 #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)
-	#undef _XBT_PLATFORM_ID
-	#define _XBT_WIN32_PLATFORM	1
-	#define _XBT_PLATFORM_ID 	_XBT_WIN32_PLATFORM
-	#define _XBT_PLATFORM_NAME	"Windows 32 bits platform"
+#undef _XBT_PLATFORM_ID
+#define _XBT_WIN32_PLATFORM	1
+#define _XBT_PLATFORM_ID 	_XBT_WIN32_PLATFORM
+#define _XBT_PLATFORM_NAME	"Windows 32 bits platform"
 /* 
  * win64.
  */
 #elif defined(_WIN64)
-	#undef _XBT_PLATFORM_ID
-	#ifdef _XBT_WIN32_PLATFORM 
-		#undef _XBT_WIN32_PLATFORM 
-	#endif
-	
-	#define _XBT_PLATFORM_NAME	"Windows 64 bits platform"
-	#define _XBT_WIN64_PLATFORM 	2
-	#define _XBT_PLATFORM_ID 	_XBT_WIN64_PLATFORM
+#undef _XBT_PLATFORM_ID
+#ifdef _XBT_WIN32_PLATFORM
+#undef _XBT_WIN32_PLATFORM
+#endif
+
+#define _XBT_PLATFORM_NAME	"Windows 64 bits platform"
+#define _XBT_WIN64_PLATFORM 	2
+#define _XBT_PLATFORM_ID 	_XBT_WIN64_PLATFORM
 /* 
  * win16.
  */
 #elif defined(_WIN16)
-	#undef _XBT_PLATFORM_ID
-	#define _XBT_WIN16_PLATFORM 	3
-	#define _XBT_PLATFORM_NAME	"Windows 16 bits platform"
-	#define _XBT_PLATFORM_ID 	_XBT_WIN16_PLATFORM
+#undef _XBT_PLATFORM_ID
+#define _XBT_WIN16_PLATFORM 	3
+#define _XBT_PLATFORM_NAME	"Windows 16 bits platform"
+#define _XBT_PLATFORM_ID 	_XBT_WIN16_PLATFORM
 /*
  * wince.
  */
 #elif defined(UNDER_CE)
-	#undef _XBT_PLATFORM_ID
-	#define __XBT_WINCE_PLATFORM 	4
-	#define _XBT_PLATFORM_ID 	_XBT_WINCE_PLATFORM
-	#define _XBT_PLATFORM_NAME	"Windows CE bits platform"
+#undef _XBT_PLATFORM_ID
+#define __XBT_WINCE_PLATFORM 	4
+#define _XBT_PLATFORM_ID 	_XBT_WINCE_PLATFORM
+#define _XBT_PLATFORM_NAME	"Windows CE bits platform"
 
 #elif defined(linux) || defined(__linux) || defined(__linux__)
 /* linux. */
-	#undef _XBT_PLATFORM_ID
-	#define __XBT_LINUX_PLATFORM 	5
-	#define _XBT_PLATFORM_ID 	_XBT_LINUX_PLATFORM
-	#define _XBT_PLATFORM_NAME	"Linux platform"
-	 
+#undef _XBT_PLATFORM_ID
+#define __XBT_LINUX_PLATFORM 	5
+#define _XBT_PLATFORM_ID 	_XBT_LINUX_PLATFORM
+#define _XBT_PLATFORM_NAME	"Linux platform"
+
 #elif defined (_XBT_ASSERT_CONFIG)
-	// This must come last - generate an error if we don't
-	// resolve the platform:
-	#error "Unknown platform - please configure (simgrid.gforge.inria.fr/xbt/libs/config/config.htm#configuring) and report the results to the main simgrid mailing list (simgrid.gforge.inra.fr/more/mailing_lists.htm#main)"
+        // This must come last - generate an error if we don't
+        // resolve the platform:
+#error "Unknown platform - please configure (simgrid.gforge.inria.fr/xbt/libs/config/config.htm#configuring) and report the results to the main simgrid mailing list (simgrid.gforge.inra.fr/more/mailing_lists.htm#main)"
+#endif
+
+#if defined(_XBT_WIN32_PLATFORM) || defined(_XBT_WIN64_PLATFORM) || defined(_XBT_WIN16_PLATFORM) || defined(_XBT_WINCE_PLATFORM)
+#ifndef _XBT_WIN32
+#define _XBT_WIN32
+#endif
 #endif
 
 
@@ -75,7 +82,7 @@
 #define _xbt_get_platform_name()	_XBT_PLATFORM_NAME
 
 /* Returns the platform id. */
-#define _xbt_get_platform_id()		_XBT_PLATFORM_ID	
+#define _xbt_get_platform_id()		_XBT_PLATFORM_ID
 
 /* Returns true if the platform is Windows 32 bits. */
 #define _xbt_is_win32()			(_XBT_PLATFORM_ID == 1)
@@ -95,4 +102,4 @@
 
 
 
-#endif /* #define __XBT_SELECT_PLATFORM_FEATURES_H__ */
\ No newline at end of file
+#endif                          /* #define __XBT_SELECT_PLATFORM_FEATURES_H__ */