Commit 2cf8064a authored by Tom Lane's avatar Tom Lane

Tweak Darwin patch to get right include order.

parent 6ef0219c
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.85 2000/12/11 00:49:52 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.86 2000/12/11 16:35:59 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
* This is so that we can support more backends. (system-wide semaphore * This is so that we can support more backends. (system-wide semaphore
* sets run out pretty fast.) -ay 4/95 * sets run out pretty fast.) -ay 4/95
* *
* $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.85 2000/12/11 00:49:52 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.86 2000/12/11 16:35:59 tgl Exp $
*/ */
#include "postgres.h" #include "postgres.h"
...@@ -61,13 +61,12 @@ ...@@ -61,13 +61,12 @@
#include <sys/sem.h> #include <sys/sem.h>
#endif #endif
#include "miscadmin.h"
#if defined(__darwin__) #if defined(__darwin__)
#include "port/darwin/sem.h" #include "port/darwin/sem.h"
#endif #endif
#include "miscadmin.h"
/* In Ultrix and QNX, sem.h must be included after ipc.h */ /* In Ultrix and QNX, sem.h must be included after ipc.h */
#ifdef HAVE_SYS_SEM_H #ifdef HAVE_SYS_SEM_H
#include <sys/sem.h> #include <sys/sem.h>
...@@ -76,6 +75,7 @@ ...@@ -76,6 +75,7 @@
#include "storage/proc.h" #include "storage/proc.h"
void HandleDeadLock(SIGNAL_ARGS); void HandleDeadLock(SIGNAL_ARGS);
static void ProcFreeAllSemaphores(void); static void ProcFreeAllSemaphores(void);
static bool GetOffWaitqueue(PROC *); static bool GetOffWaitqueue(PROC *);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment