don't choke on MSVC; cosmetics in cmake output

[simgrid.git] / src / win32 / config.h

diff --git a/src/win32/config.h b/src/win32/config.h
index 9f0d9f2..8e64955 100644 (file)
--- a/src/win32/config.h
+++ b/src/win32/config.h
@@ -4,7 +4,7 @@
 
 /* config.h - simgrid config selection for windows platforms. */
 
-/* Copyright (c) 2006, 2007, 2008, 2010. The SimGrid Team.
+/* Copyright (c) 2006-2008, 2010, 2012-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -13,17 +13,21 @@
 /* 
  * config selection. 
 */
-#if defined(__GNUC__)
-        /* data comes from autoconf when using gnuc (cross-compiling?) */
+#if defined(__GNUC__) /* either MinGW or cross-compiling */
   # include "internal_config.h"
   #ifndef _XBT_WIN32
     typedef unsigned int uint32_t;
   #endif
-# else
-  # error "Unknown compiler - please report the problems to the main simgrid mailing list (http://gforge.inria.fr/mail/?group_id=12)"
+#else
+  #ifdef _MSC_VER /* MSVC */
+    /* Here come the HAVE_* macro that are manually defined when using MSVC */
+    /*    (none for now)    */
+  # else
+    # error "Unknown compiler - please report the problems to the main simgrid mailing list (http://gforge.inria.fr/mail/?group_id=12)"
+  #endif
 #endif
 
-#ifndef _XBT_VISUALC_COMPILER
+#ifndef _MSC_VER
   #ifndef EWOULDBLOCK
   #define EWOULDBLOCK WSAEWOULDBLOCK
   #endif