W32-specific platform stuff is now pure C

2 files changed, 4 insertions, 10 deletions

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 35b006483..48b8e350e 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -14,7 +14,7 @@ if MINGW
 noinst_LTLIBRARIES = \
   libgnunetutilwin.la
 libgnunetutilwin_la_SOURCES = \
-  win.cc \
+  win.c \
   winproc.c
 libgnunetutilwin_la_LDFLAGS = \
   -no-undefined -Wl,--export-all-symbols 
diff --git a/src/util/win.cc b/src/util/win.c
index 7b67c9e83..18e3e80c0 100644
--- a/src/util/win.cc
+++ b/src/util/win.c
@@ -19,29 +19,25 @@
 */

 

 /**

- * @file util/win.cc

+ * @file util/win.c

  * @brief Helper functions for MS Windows in C++

  * @author Nils Durner

  */

 

-#ifndef _WIN_CC

-#define _WIN_CC

+#ifndef _WIN_C

+#define _WIN_C

 

 #include "winproc.h"

 #include "platform.h"

 #include "gnunet_common.h"

 #include "gnunet_connection_lib.h"

 

-#include <list>

-using namespace std;

 #include <ntdef.h>

 

 #ifndef INHERITED_ACE

 #define INHERITED_ACE 0x10

 #endif

 

-extern "C" {

-

 int plibc_conv_to_win_path(const char *pszUnix, char *pszWindows);

 

 #define _IP_ADAPTER_UNICAST_ADDRESS_HEAD \

@@ -1330,6 +1326,4 @@ SafeTerminateProcess (HANDLE hProcess, UINT uExitCode, DWORD dwTimeout)
   return bSuccess;

 }
 

-} /* extern "C" */

-

 #endif