Win32 compile fix for misc_utils.

Claudio Natoli

diff --git a/contrib/miscutil/misc_utils.h b/contrib/miscutil/misc_utils.h
index f4577f49de402142bb829babe4160364ee0b4869..bc69ba8615753cf0d9210ca45985fffe691e9e03 100644 (file)
--- a/contrib/miscutil/misc_utils.h
+++ b/contrib/miscutil/misc_utils.h
@@ -1,6 +1,13 @@
 #ifndef MISC_UTILS_H
 #define MISC_UTILS_H
 
+#ifdef max
+#undef max
+#endif
+#ifdef min
+#undef min
+#endif
+
 int                    backend_pid(void);
 int                    unlisten(char *relname);
 int                    max(int x, int y);

diff --git a/src/include/port/win32.h b/src/include/port/win32.h
index d957463223874099010b16c803af7d9868514915..b2ebdd4e3ffc93557cb2ad87fc425d72492179c9 100644 (file)
--- a/src/include/port/win32.h
+++ b/src/include/port/win32.h
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.32 2004/09/09 00:59:44 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/include/port/win32.h,v 1.33 2004/09/14 03:50:17 tgl Exp $ */
 
 /* undefine and redefine after #include */
 #undef mkdir
@@ -166,6 +166,7 @@ void                _dosmaperr(unsigned long);
 #define SIGPIPE                                13
 #define SIGALRM                                14
 #define SIGSTOP                                17
+#define SIGTSTP                                18
 #define SIGCONT                                19
 #define SIGCHLD                                20
 #define SIGTTIN                                21