Merge remote-tracking branch 'github/pr/34'

[exim.git] / src / OS / os.h-cygwin

diff --git a/src/OS/os.h-cygwin b/src/OS/os.h-cygwin
index ebd9c848b4df88da37d941cdd5fea624a9306d76..07c14d04d9f32fad0a05a0455b24c41b90c09690 100644 (file)
--- a/src/OS/os.h-cygwin
+++ b/src/OS/os.h-cygwin
@@ -1,5 +1,3 @@
-/* $Cambridge: exim/src/OS/os.h-cygwin,v 1.1 2004/10/06 15:07:39 ph10 Exp $ */
-
 /* Exim: OS-specific C header file for Cygwin */
 
 /* This code was supplied by Pierre A. Humblet <Pierre.Humblet@ieee.org> */
@@ -7,9 +5,9 @@
 /* Define the OS_INIT macro that we insert in exim.c:main()
    to set the root and exim uid depending on the system */
 /* We use a special routine to initialize */
-void cygwin_init(int, char **, void *, void *, void *, void *);
+void cygwin_init(int, char **, void *, void *, void *, void *, void *);
 #define OS_INIT\
-  cygwin_init(argc, (char **) argv, &root_uid, &exim_uid, &exim_gid, &config_uid);
+  cygwin_init(argc, (char **) argv, &root_uid, &exim_uid, &exim_gid, &config_uid, &config_gid);
 
 /* We need a special mkdir that
    allows names starting with // */
@@ -27,7 +25,7 @@ int cygwin_setgid(gid_t gid );
 extern unsigned int cygwin_WinVersion;
 
 #define BASE_62 36  /* Windows aliases lower and upper cases in filenames.
-                      Consider reducing MAX_LOCALHOST_NUMBER */
+                       Consider reducing MAX_LOCALHOST_NUMBER */
 #define CRYPT_H
 #define HAVE_MMAP
 #define HAVE_SYS_VFS_H
@@ -50,4 +48,7 @@ struct  { \
   DWORD SubAuthority[n]; \
 } name = { SID_REVISION, n, {SECURITY_NT_AUTHORITY}, {sid}}
 
+/* default is non-const */
+#define ICONV_ARG2_TYPE const char **
+
 /* End */