summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2004-09-14 03:50:17 +0000
committerTom Lane2004-09-14 03:50:17 +0000
commit4f7d3e0faf9f06c77de49ed9fa863dc344959c3e (patch)
tree52cf5a49bbe5b8e1236a1cc221bf0e4fcd88a9f2
parentbf06825e31de28692f3976e729c2700274d9b578 (diff)
Win32 compile fix for misc_utils.
Claudio Natoli
-rw-r--r--contrib/miscutil/misc_utils.h7
-rw-r--r--src/include/port/win32.h3
2 files changed, 9 insertions, 1 deletions
diff --git a/contrib/miscutil/misc_utils.h b/contrib/miscutil/misc_utils.h
index f4577f49de4..bc69ba86157 100644
--- 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 d9574632238..b2ebdd4e3ff 100644
--- 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