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

[paraslash.git] / ipc.c

diff --git a/ipc.c b/ipc.c
index 40f6a9512287e2689c140f0e5d31017dff5cea83..a9d7351ce6ddf1a416e2419440857cb3cee70eb9 100644 (file)
--- a/ipc.c
+++ b/ipc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -11,7 +11,6 @@
 #include "ipc.h"
 #include <sys/types.h>
 #include <sys/param.h>
-#include <sys/sysctl.h>
 
 #include <sys/ipc.h>
 #include <sys/shm.h>
@@ -177,9 +176,8 @@ int shm_detach(void *addr)
 }
 
 # if defined __FreeBSD__ || defined __NetBSD__
+#include <sys/sysctl.h>
 #      define SYSCTL_SHMMAX_VARIABLE "kern.ipc.shmmax"
-# elif defined __APPLE__
-#      define SYSCTL_SHMMAX_VARIABLE "kern.sysv.shmmax"
 # else
 #      undef SYSCTL_SHMMAX_VARIABLE
 # endif
@@ -209,6 +207,7 @@ size_t shm_get_shmmax(void)
                                buf[ret] = '\0';
                                shmmax = strtoul(buf, NULL, 10);
                        }
+                       close(fd);
                }
        }
 #elif defined SYSCTL_SHMMAX_VARIABLE
@@ -221,7 +220,7 @@ size_t shm_get_shmmax(void)
 #endif
        if (shmmax == 0) {
                PARA_WARNING_LOG("unable to determine shmmax\n");
-               shmmax = 65535; /* last ressort */
+               shmmax = 65535; /* last resort */
        }
        PARA_INFO_LOG("shmmax: %zu\n", shmmax);
        return shmmax;