---------------------
PatchSet 2121 
Date: 2005/11/06 16:13:55
Author: serassio
Branch: nt
Tag: (none) 
Log:
Arranged Windows specific include files

Members: 
	include/squid_mswin.h:1.1.2.2->1.1.2.3 
	include/util.h:1.8.2.4->1.8.2.5 

Index: squid3/include/squid_mswin.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/include/squid_mswin.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- squid3/include/squid_mswin.h	30 Oct 2005 20:00:24 -0000	1.1.2.2
+++ squid3/include/squid_mswin.h	6 Nov 2005 16:13:55 -0000	1.1.2.3
@@ -1,5 +1,5 @@
 /*
- * $Id: squid_mswin.h,v 1.1.2.2 2005/10/30 20:00:24 serassio Exp $
+ * $Id: squid_mswin.h,v 1.1.2.3 2005/11/06 16:13:55 serassio Exp $
  *
  * AUTHOR: Guido Serassio & Andrey Shorin
  *
@@ -737,3 +737,23 @@
 };
 
 #undef ACL
+
+SQUIDCEXTERN int chroot (const char *);
+SQUIDCEXTERN int ftruncate(int, off_t);
+SQUIDCEXTERN int gettimeofday(struct timeval * ,void *);
+SQUIDCEXTERN int kill(pid_t, int);
+SQUIDCEXTERN int statfs(const char *, struct statfs *);
+SQUIDCEXTERN int truncate(const char *, off_t);
+SQUIDCEXTERN const char * wsastrerror(int);
+SQUIDCEXTERN struct passwd *getpwnam(char *);
+SQUIDCEXTERN struct group *getgrnam(char *);
+SQUIDCEXTERN uid_t geteuid(void);
+SQUIDCEXTERN uid_t getuid(void);
+SQUIDCEXTERN int setuid(uid_t);
+SQUIDCEXTERN int seteuid(uid_t);
+SQUIDCEXTERN gid_t getgid(void);
+SQUIDCEXTERN gid_t getegid(void);
+SQUIDCEXTERN int setgid(gid_t);
+SQUIDCEXTERN int setegid(gid_t);
+SQUIDCEXTERN const char *WIN32_strerror(int);
+SQUIDCEXTERN void WIN32_maperror(unsigned long);
Index: squid3/include/util.h
===================================================================
RCS file: /cvsroot/squid-sf//squid3/include/util.h,v
retrieving revision 1.8.2.4
retrieving revision 1.8.2.5
diff -u -r1.8.2.4 -r1.8.2.5
--- squid3/include/util.h	22 Apr 2005 18:58:11 -0000	1.8.2.4
+++ squid3/include/util.h	6 Nov 2005 16:13:55 -0000	1.8.2.5
@@ -1,5 +1,5 @@
 /*
- * $Id: util.h,v 1.8.2.4 2005/04/22 18:58:11 serassio Exp $
+ * $Id: util.h,v 1.8.2.5 2005/11/06 16:13:55 serassio Exp $
  *
  * AUTHOR: Harvest Derived
  *
@@ -164,28 +164,4 @@
  */
 int statMemoryAccounted(void);
 
-/* CygWin & Windows NT Port */ 
-/* win32lib.c */
-#ifdef _SQUID_MSWIN_
-SQUIDCEXTERN int chroot (const char *);
-SQUIDCEXTERN int ftruncate(int, off_t);
-SQUIDCEXTERN int gettimeofday(struct timeval * ,void *);
-SQUIDCEXTERN int kill(pid_t, int);
-SQUIDCEXTERN int statfs(const char *, struct statfs *);
-SQUIDCEXTERN int truncate(const char *, off_t);
-SQUIDCEXTERN const char * wsastrerror(int);
-SQUIDCEXTERN struct passwd *getpwnam(char *);
-SQUIDCEXTERN struct group *getgrnam(char *);
-SQUIDCEXTERN uid_t geteuid(void);
-SQUIDCEXTERN uid_t getuid(void);
-SQUIDCEXTERN int setuid(uid_t);
-SQUIDCEXTERN int seteuid(uid_t);
-SQUIDCEXTERN gid_t getgid(void);
-SQUIDCEXTERN gid_t getegid(void);
-SQUIDCEXTERN int setgid(gid_t);
-SQUIDCEXTERN int setegid(gid_t);
-SQUIDCEXTERN const char *WIN32_strerror(int);
-SQUIDCEXTERN void WIN32_maperror(unsigned long);
-#endif
-
 #endif /* SQUID_UTIL_H */