missing changes to headers

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

diff --git a/src/include/winproc.h b/src/include/winproc.h
index ac4eecdfb37947485b9ee546b4b36726adf36a26..3fbe13328f3f83e9cdc3a1f62738c9771a1eee8c 100644 (file)
--- a/src/include/winproc.h
+++ b/src/include/winproc.h
@@ -1,10 +1,10 @@
 /*
      This file is part of GNUnet.
-     (C) 2001, 2002, 2003, 2004, 2005 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2001, 2002, 2003, 2004, 2005 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -34,6 +34,9 @@
 #include <sys/timeb.h>
 #include <time.h>
 #include <dirent.h>
+#ifndef FD_SETSIZE
+#define FD_SETSIZE 1024
+#endif
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <windows.h>
@@ -109,7 +112,7 @@ extern "C"
   typedef NET_API_STATUS WINAPI (*TNetUserSetInfo) (LPCWSTR servername,
                                                     LPCWSTR username,
                                                     DWORD level, LPBYTE buf,
-                                                    LPDWORD parm_err);
+                                                    LPDWORD param_err);
   typedef NTSTATUS NTAPI (*TLsaOpenPolicy) (PLSA_UNICODE_STRING,
                                             PLSA_OBJECT_ATTRIBUTES, ACCESS_MASK,
                                             PLSA_HANDLE);
@@ -208,22 +211,23 @@ extern "C"
 #define ENUMNICS3_MASK_OK 0x01
 #define ENUMNICS3_BCAST_OK 0x02
 
-struct EnumNICs3_results
-{
-  unsigned char flags;
-  int is_default;
-  char pretty_name[1001];
-  size_t addr_size;
-  struct sockaddr address;
-  struct sockaddr mask;
-  struct sockaddr broadcast;
-};
+  struct EnumNICs3_results
+  {
+    unsigned char flags;
+    int is_default;
+    char pretty_name[1001];
+    size_t addr_size;
+    SOCKADDR_STORAGE address;
+    SOCKADDR_STORAGE mask;
+    SOCKADDR_STORAGE broadcast;
+  };
 
   int EnumNICs3 (struct EnumNICs3_results **, int *EnumNICs3_results_count);
   void EnumNICs3_free (struct EnumNICs3_results *);
   int GNInitWinEnv ();
   void GNShutdownWinEnv ();
 
+  BOOL SafeTerminateProcess (HANDLE hProcess, UINT uExitCode, DWORD dwTimeout);
 #ifdef __cplusplus
 }
 #endif