LRN patch from Mantis #1615

4 files changed, 11 insertions, 4 deletions

diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 57008fa08..badb52880 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -138,6 +138,7 @@ typedef int (*GNUNET_FileNameCallback) (void *cls, const char *filename);
  */
 enum GNUNET_ErrorType
 {
+  GNUNET_ERROR_TYPE_NONE = 0,
   GNUNET_ERROR_TYPE_ERROR = 1,
   GNUNET_ERROR_TYPE_WARNING = 2,
   GNUNET_ERROR_TYPE_INFO = 4,
diff --git a/src/include/platform.h b/src/include/platform.h
index 1b279d123..cc2aa03ae 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -78,6 +78,7 @@
 
 #ifdef _MSC_VER
 #include <Winsock2.h>
+#include <ws2tcpip.h>
 #else
 #ifndef MINGW
 #include <netdb.h>
@@ -108,6 +109,9 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <signal.h>
+#ifdef WINDOWS
+#include <malloc.h> /* for alloca(), on other OSes it's in stdlib.h */
+#endif
 #ifndef _MSC_VER
 #include <unistd.h>             /* KLB_FIX */
 #endif
diff --git a/src/include/plibc.h b/src/include/plibc.h
index 4e3204c98..a59e53de9 100644
--- a/src/include/plibc.h
+++ b/src/include/plibc.h
@@ -50,8 +50,9 @@ extern "C" {
   #include "langinfo.h"
 #endif
 
-#include <windows.h>
+#include <winsock2.h>
 #include <ws2tcpip.h>
+#include <windows.h>
 #include <sys/types.h>
 #include <time.h>
 #include <stdio.h>
@@ -334,7 +335,7 @@ BOOL _plibc_CreateShortcut(const char *pszSrc, const char *pszDest);
 BOOL _plibc_DereferenceShortcut(char *pszShortcut);
 char *plibc_ChooseDir(char *pszTitle, unsigned long ulFlags);
 char *plibc_ChooseFile(char *pszTitle, unsigned long ulFlags);
-long QueryRegistry(HKEY hMainKey, char *pszKey, char *pszSubKey,
+long QueryRegistry(HKEY hMainKey, const char *pszKey, const char *pszSubKey,
               char *pszBuffer, long *pdLength);
 
 BOOL __win_IsHandleMarkedAsBlocking(int hHandle);
diff --git a/src/include/winproc.h b/src/include/winproc.h
index 0298c2d59..595180a96 100644
--- a/src/include/winproc.h
+++ b/src/include/winproc.h
@@ -34,8 +34,9 @@
 #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>
@@ -198,7 +199,7 @@ 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) (void *, const char *, int), void *cls);
   BOOL AddPathAccessRights (char *lpszFileName, char *lpszAccountName,