From c6411605e110ff2f0815544471b65eaacc0f0515 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 12 Oct 1999 14:54:28 +0000
Subject: [PATCH] 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
---
src/backend/storage/lmgr/proc.c | 6 +++---
src/include/port/win.h | 5 +++++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index 0270b0e1165..38f60ebdfa2 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.62 1999/10/06 21:58:07 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.63 1999/10/12 14:54:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -46,14 +46,14 @@
* 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.62 1999/10/06 21:58:07 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.63 1999/10/12 14:54:27 momjian Exp $
*/
#include <sys/time.h>
#include <unistd.h>
#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 15a89a0e43e..61acdb3e21e 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
--
GitLab