Avoid warning about sys/sysctl.h on glibc-2.30.

[paraslash.git] / ipc.c

diff --git a/ipc.c b/ipc.c
index d7f515dfec8788f267a41f8c33264d25b15abf8a..8e9dd51a2369e7e60ebd4bda3fa889eaed892248 100644 (file)
--- a/ipc.c
+++ b/ipc.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */

 
 /** \file ipc.c Inter-process communication and shared memory helpers. */
 
 
 /** \file ipc.c Inter-process communication and shared memory helpers. */
 


@@ -11,7 +7,6 @@
 #include "ipc.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include "ipc.h"
 #include <sys/types.h>
 #include <sys/param.h>

-#include <sys/sysctl.h>

 
 #include <sys/ipc.h>
 #include <sys/shm.h>
 
 #include <sys/ipc.h>
 #include <sys/shm.h>


@@ -68,7 +63,7 @@ static void para_semop(int id, struct sembuf *sops, int num)
  *
  * This function either succeeds or aborts.
  *
  *
  * This function either succeeds or aborts.
  *

- * \sa semop(2), struct misc_meta_data.
+ * \sa semop(2), struct \ref misc_meta_data.

  */
 void mutex_lock(int id)
 {
  */
 void mutex_lock(int id)
 {


@@ -94,7 +89,7 @@ void mutex_lock(int id)
  *
  * This function either succeeds or aborts.
  *
  *
  * This function either succeeds or aborts.
  *

- * \sa semop(2), struct misc_meta_data.
+ * \sa semop(2), struct \ref misc_meta_data.

  */
 void mutex_unlock(int id)
 {
  */
 void mutex_unlock(int id)
 {


@@ -198,9 +193,8 @@ int shm_detach(void *addr)
 }
 
 # if defined __FreeBSD__ || defined __NetBSD__
 }
 
 # if defined __FreeBSD__ || defined __NetBSD__

+#include <sys/sysctl.h>

 #      define SYSCTL_SHMMAX_VARIABLE "kern.ipc.shmmax"
 #      define SYSCTL_SHMMAX_VARIABLE "kern.ipc.shmmax"

-# elif defined __APPLE__
-#      define SYSCTL_SHMMAX_VARIABLE "kern.sysv.shmmax"

 # else
 #      undef SYSCTL_SHMMAX_VARIABLE
 # endif
 # else
 #      undef SYSCTL_SHMMAX_VARIABLE
 # endif