--------------------- PatchSet 3244 Date: 2001/10/21 20:19:26 Author: serassio Branch: cygwin-svc Tag: (none) Log: Pre cvsmerge commit Members: include/config.h:1.3->1.3.2.1 Index: squid/include/config.h =================================================================== RCS file: /cvsroot/squid-sf//squid/include/config.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- squid/include/config.h 9 Oct 2001 21:17:59 -0000 1.3 +++ squid/include/config.h 21 Oct 2001 20:19:26 -0000 1.3.2.1 @@ -31,8 +31,8 @@ * */ -#ifndef SQUID_CONFIG_H -#define SQUID_CONFIG_H +#ifndef _CONFIG_H_ +#define _CONFIG_H_ #include "autoconf.h" /* For GNU autoconf variables */ #include "version.h" @@ -107,6 +107,18 @@ #elif defined(WIN32) || defined(WINNT) || defined(__WIN32__) || defined(__WIN32) #define _SQUID_MSWIN_ +/* Some tricks for MS Compilers */ +#define chdir _chdir +#define getcwd _getcwd +#define getpid _getpid +#define mkdir _mkdir +#define setmode _setmode +#define umask _umask +#define O_BYNARY _O_BINARY +#define O_TEXT _O_TEXT +#define S_IRWXO _S_IREAD | _S_IWRITE | _S_IEXEC +#define S_ISDIR(m) (((m) & _S_IFDIR) == _S_IFDIR) + #elif defined(__APPLE__) #define _SQUID_APPLE_ @@ -128,6 +140,14 @@ #endif #endif +#if !defined(CACHE_HTTP_PORT) +#define CACHE_HTTP_PORT 3128 +#endif + +#if !defined(CACHE_ICP_PORT) +#define CACHE_ICP_PORT 3130 +#endif + #if !defined(CACHEMGR_HOSTNAME) #define CACHEMGR_HOSTNAME "" #endif @@ -175,4 +195,4 @@ #define squid_srandom srand #endif -#endif /* SQUID_CONFIG_H */ +#endif /* _CONFIG_H_ */