kill the useless win32/config.h

diff --git a/src/portable.h b/src/portable.h
index cbc1c57..5aca544 100644 (file)
--- a/src/portable.h
+++ b/src/portable.h
@@ -12,11 +12,7 @@
 
 #include "internal_config.h"
 #include "xbt/misc.h"
 
 #include "internal_config.h"
 #include "xbt/misc.h"

-/* 
- * win32 or win64 (__XBT_WIN32 is defined for win32 and win64 applications, __TOS_WIN__ is defined by xlC).
-*/

 #ifdef _XBT_WIN32
 #ifdef _XBT_WIN32

-# include "win32/config.h"

 # include <windows.h>
 #endif
 
 # include <windows.h>
 #endif
 


@@ -44,6 +40,30 @@
 
 #include <fcntl.h>
 
 
 #include <fcntl.h>
 

+#ifdef _XBT_WIN32
+  #ifndef EWOULDBLOCK
+  #define EWOULDBLOCK WSAEWOULDBLOCK
+  #endif
+
+  #ifndef EINPROGRESS
+  #define EINPROGRESS WSAEINPROGRESS
+  #endif
+
+  #ifndef ETIMEDOUT
+  #define ETIMEDOUT   WSAETIMEDOUT
+  #endif
+
+  #ifdef S_IRGRP
+    #undef S_IRGRP
+  #endif
+  #define S_IRGRP 0
+
+  #ifdef S_IWGRP
+    #undef S_IWGRP
+  #endif
+  #define S_IWGRP 0
+#endif
+

 #ifdef HAVE_SYS_STAT_H
 #  include <sys/stat.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
 #  include <sys/stat.h>
 #endif

diff --git a/src/win32/config.h b/src/win32/config.h
deleted file mode 100644 (file)
index d63a083..0000000
--- a/src/win32/config.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef __XBT_WIN32_CONFIG_H__
-#define __XBT_WIN32_CONFIG_H__
-
-
-/* config.h - simgrid config selection for windows platforms. */
-
-/* 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
- * under the terms of the license (GNU LGPL) which comes with this package. */
-
-/* 
- * config selection. 
-*/
-#if defined(__GNUC__) /* either MinGW or cross-compiling */
-  # include "internal_config.h"
-  #ifndef _XBT_WIN32
-    typedef unsigned int uint32_t;
-  #endif
-#else
-  #ifdef _MSC_VER /* MSVC */
-
-    /* Manually define the HAVE_* corresponding to the MSVC development environment */
-    #define HAVE_VA_COPY
-
-  # 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 _MSC_VER
-  #ifndef EWOULDBLOCK
-  #define EWOULDBLOCK WSAEWOULDBLOCK
-  #endif
-
-  #ifndef EINPROGRESS
-  #define EINPROGRESS WSAEINPROGRESS
-  #endif
-
-  #ifndef ETIMEDOUT
-  #define ETIMEDOUT   WSAETIMEDOUT
-  #endif
-#endif
-
-#ifdef S_IRGRP
-  #undef S_IRGRP
-#endif
-
-#define S_IRGRP 0
-
-#ifdef S_IWGRP
-  #undef S_IWGRP
-#endif
-
-#define S_IWGRP 0
-
-#endif                          /* #ifndef __XBT_WIN32_CONFIG_H__ */

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index fa90c08..1874494 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -87,7 +87,6 @@ set(EXTRA_DIST
   src/surf/host_clm03.hpp
   src/surf/host_interface.hpp
   src/surf/host_ptask_L07.hpp
   src/surf/host_clm03.hpp
   src/surf/host_interface.hpp
   src/surf/host_ptask_L07.hpp

-  src/win32/config.h

   src/xbt/automaton/automaton_lexer.yy.c
   src/xbt/automaton/parserPromela.lex
   src/xbt/automaton/parserPromela.tab.cacc
   src/xbt/automaton/automaton_lexer.yy.c
   src/xbt/automaton/parserPromela.lex
   src/xbt/automaton/parserPromela.tab.cacc