Banish caddr_t (mostly), use Datum where appropriate.

[postgresql] / src / backend / storage / lmgr / proc.c

diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index 01818e99fa713a82afaffa6faee60907a10d3bb9..e68d96d772951f89f4aaf1093e92b152ca0eed26 100644 (file)
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.77 2000/07/31 01:16:24 inoue Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.80 2000/10/02 19:42:48 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,8 +47,10 @@
  *             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.77 2000/07/31 01:16:24 inoue Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/lmgr/proc.c,v 1.80 2000/10/02 19:42:48 petere Exp $
  */
+#include "postgres.h"
+
 #include <sys/time.h>
 #include <unistd.h>
 #include <signal.h>
@@ -59,7 +61,6 @@
 #include <sys/sem.h>
 #endif
 
-#include "postgres.h"
 #include "miscadmin.h"
 
 
@@ -140,7 +141,7 @@ InitProcGlobal(IPCKey key, int maxBackends)
                 * Arrange to delete semas on exit --- set this up now so that we
                 * will clean up if pre-allocation fails...
                 */
-               on_shmem_exit(ProcFreeAllSemaphores, NULL);
+               on_shmem_exit(ProcFreeAllSemaphores, 0);
 
                /*
                 * Pre-create the semaphores for the first maxBackends processes,
@@ -306,7 +307,7 @@ InitProcess(IPCKey key)
        MyProc->errType = NO_ERROR;
        SHMQueueElemInit(&(MyProc->links));
 
-       on_shmem_exit(ProcKill, (caddr_t) MyProcPid);
+       on_shmem_exit(ProcKill, (Datum) MyProcPid);
 }
 
 /* -----------------------