summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>1999-10-12 14:55:01 +0000
committerBruce Momjian <bruce@momjian.us>1999-10-12 14:55:01 +0000
commit5d76ea6dc58fb59c47b0978261dd26cbc33192f8 (patch)
tree14aae9297e1881f7014e86f186646ffaee95ee0f
parent987b1b9e5575d787ef304aae8e3e95e2b0d95e64 (diff)
downloadpostgresql-5d76ea6dc58fb59c47b0978261dd26cbc33192f8.tar.gz
I have created a small patch that makes possible to compile pgsql on newer
Cygwin snapshots (tested on 990115 which is recommended to use - it fixes some errors in B20.1) And I have another patch for including <sys/ipc.h> before <sys/sem.h> in backend/storage/lmgr/proc.c - it is required due the design of cygipc headers Dan
-rw-r--r--src/backend/storage/lmgr/proc.c6
-rw-r--r--src/include/port/win.h5
2 files changed, 8 insertions, 3 deletions
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index d88ded9a7a..0f347910c9 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.57 1999/05/25 22:42:03 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.57.2.1 1999/10/12 14:55:00 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -46,7 +46,7 @@
* This is so that we can support more backends. (system-wide semaphore
* sets run out pretty fast.) -ay 4/95
*
- * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.57 1999/05/25 22:42:03 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.57.2.1 1999/10/12 14:55:00 momjian Exp $
*/
#include <sys/time.h>
#include <unistd.h>
@@ -54,7 +54,7 @@
#include <signal.h>
#include <sys/types.h>
-#if defined(solaris_sparc)
+#if defined(solaris_sparc) || defined(__CYGWIN__)
#include <sys/ipc.h>
#include <sys/sem.h>
#endif
diff --git a/src/include/port/win.h b/src/include/port/win.h
index 15a89a0e43..61acdb3e21 100644
--- a/src/include/port/win.h
+++ b/src/include/port/win.h
@@ -9,3 +9,8 @@ typedef unsigned char slock_t;
#define tzname _tzname /* should be in time.h? */
#define USE_POSIX_TIME
#define HAVE_INT_TIMEZONE /* has int _timezone */
+
+#include <cygwin/version.h>
+#if (CYGWIN_VERSION_API_MAJOR >= 0) && (CYGWIN_VERSION_API_MINOR >= 8)
+#define sys_nerr _sys_nerr
+#endif