check

[oweals/gnunet.git] / src / include / winproc.h

diff --git a/src/include/winproc.h b/src/include/winproc.h
index a4a173a13a592c7dd9227f5da0dae8c12697f3d4..a29130e660e353f47d9f8a2a46bc197d30762de1 100644 (file)
--- a/src/include/winproc.h
+++ b/src/include/winproc.h
@@ -19,10 +19,10 @@
 */
 
 /**
- * @file util/winproc.h
+ * @file include/winproc.h
  * @brief Definitions for MS Windows
  * @author Nils Durner
- **/
+ */
 
 #ifndef _WINPROC_H
 #define _WINPROC_H
@@ -34,18 +34,18 @@
 #include <sys/timeb.h>
 #include <time.h>
 #include <dirent.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
 #include <windows.h>
-#include <winsock.h>
 #include <winerror.h>
 #include <iphlpapi.h>
 #include <shlobj.h>
 #include <objbase.h>
 #include <sys/param.h>          /* #define BYTE_ORDER */
-#include <Ntsecapi.h>
+#include <ntsecapi.h>
 #include <lm.h>
-#include <Aclapi.h>
-#include "gnunet_util.h"
-#include "platform.h"
+#include <aclapi.h>
+
 
 #ifdef __cplusplus
 extern "C"
@@ -199,14 +199,14 @@ extern "C"
 
   BOOL CreateShortcut (const char *pszSrc, const char *pszDest);
   BOOL DereferenceShortcut (char *pszShortcut);
-  long QueryRegistry (HKEY hMainKey, char *pszKey, char *pszSubKey,
+  long QueryRegistry (HKEY hMainKey, const char *pszKey, const char *pszSubKey,
                       char *pszBuffer, long *pdLength);
-  int ListNICs (void (*callback) (const char *, int, void *), void *cls);
+  int ListNICs (void (*callback) (void *, const char *, int), void *cls);
   BOOL AddPathAccessRights (char *lpszFileName, char *lpszAccountName,
                             DWORD dwAccessMask);
   char *winErrorStr (const char *prefix, int dwErr);
-
-  void GNInitWinEnv ();
+  void EnumNICs(PMIB_IFTABLE *pIfTable, PMIB_IPADDRTABLE *pAddrTable);
+  int GNInitWinEnv ();
   void GNShutdownWinEnv ();
 
 #ifdef __cplusplus