[mpich2-commits] r6658 - mpich2/trunk/src/pm/hydra/include

[jayesh at mcs.anl.gov]

Author: jayesh
Date: 2010-05-17 11:41:43 -0500 (Mon, 17 May 2010)
New Revision: 6658

Modified:
   mpich2/trunk/src/pm/hydra/include/hydra_base.h
Log:
Removing winsock2 header file from hydra & including lean version of windows header file. This prevents re-decls of socket functions with gcc on cygwin. We need to check usability of winsock2 hdr before including it

Modified: mpich2/trunk/src/pm/hydra/include/hydra_base.h
===================================================================
--- mpich2/trunk/src/pm/hydra/include/hydra_base.h	2010-05-17 15:52:56 UTC (rev 6657)
+++ mpich2/trunk/src/pm/hydra/include/hydra_base.h	2010-05-17 16:41:43 UTC (rev 6658)
@@ -10,11 +10,8 @@
 #include <stdio.h>
 #include "hydra_config.h"
 
-#if defined HAVE_WINSOCK2_H
-#include <winsock2.h>
-#endif /* HAVE_WINSOCK2_H */
-
 #if defined HAVE_WINDOWS_H
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif /* HAVE_WINDOWS_H */