cosmetics

diff --git a/configure.ac b/configure.ac
index d692a1de45b59aa76a2b16e837777e0b14382e1b..b05ba374b81b3847389a59fd7178d06dfba6b9cd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -69,10 +69,10 @@ DEFAULT_INTERFACE="\"eth0\""
 # Check system type
 case "$host_os" in
 *darwin* | *rhapsody* | *macosx*)
-     AC_DEFINE_UNQUOTED(OSX,1,[This is an OS X system])
+     AC_DEFINE_UNQUOTED(DARWIN,1,[This is an Apple Darwin system])
      CFLAGS="-no-cpp-precomp -fno-common $CFLAGS"
      AC_MSG_WARN([The VPN application cannot be compiled on your OS])
-     build_target="macosx"
+     build_target="darwin"
      DEFAULT_INTERFACE="\"en0\""
      LIBPREFIX=
      DLLDIR=lib
@@ -155,7 +155,7 @@ AC_DEFINE_UNQUOTED([GNUNET_DEFAULT_INTERFACE], $DEFAULT_INTERFACE, [This should
 AC_SUBST(DEFAULT_INTERFACE)
 
 AC_MSG_CHECKING([for build target])
-AM_CONDITIONAL(MACOSX,  test "$build_target" = "macosx")
+AM_CONDITIONAL(DARWIN,  test "$build_target" = "darwin")
 AM_CONDITIONAL(CYGWIN,  test "$build_target" = "cygwin")
 AM_CONDITIONAL(MINGW,   test "$build_target" = "mingw")
 AM_CONDITIONAL(SOLARIS, test "$build_target" = "solaris")

diff --git a/src/include/platform.h b/src/include/platform.h
index a649d3aa5ceabd2ab76e0e451343f92676425dad..257fc7c6b1685d0eea85c773199a14925d02849f 100644 (file)
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -128,7 +128,7 @@
 #ifdef GNUNET_freeBSD
 #include <semaphore.h>
 #endif
-#ifdef OSX
+#ifdef DARWIN
 #include <dlfcn.h>
 #include <semaphore.h>
 #include <net/if.h>
@@ -192,11 +192,10 @@
 #define __BIG_ENDIAN BIG_ENDIAN
 #endif
 
-#ifdef OSX
-#define socklen_t unsigned int
+#ifdef DARWIN
 #define __BYTE_ORDER BYTE_ORDER
 #define __BIG_ENDIAN BIG_ENDIAN
- /* not available on OS X, override configure */
+ /* not available on darwin, override configure */
 #undef HAVE_STAT64
 #undef HAVE_MREMAP
 #endif

diff --git a/src/util/disk.c b/src/util/disk.c
index c3d6f650b84a9ba01e7688fae63bc58ee7730efb..40d637ee39b6f1af5c00e4c119e977b7667124b8 100644 (file)
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -41,14 +41,10 @@
 
 
 
-#if LINUX || CYGWIN
+#if defined(LINUX) || defined(CYGWIN)
 #include <sys/vfs.h>
 #else
-#ifdef SOMEBSD
-#include <sys/param.h>
-#include <sys/mount.h>
-#else
-#ifdef OSX
+#if defined(SOMEBSD) || defined(DARWIN)
 #include <sys/param.h>
 #include <sys/mount.h>
 #else
@@ -66,15 +62,10 @@
 #endif
 #endif
 #endif
-#endif
 
-#ifndef SOMEBSD
-#ifndef WINDOWS
-#ifndef OSX
+#if !defined(SOMEBSD) && !defined(DARWIN) && !defined(WINDOWS)
 #include <wordexp.h>
 #endif
-#endif
-#endif
 #if LINUX
 #include <sys/statvfs.h>
 #endif
@@ -1584,7 +1575,7 @@ GNUNET_DISK_file_sync (const struct GNUNET_DISK_FileHandle *h)
   if (ret != GNUNET_OK)
     SetErrnoFromWinError (GetLastError ());
   return ret;
-#elif FREEBSD || OPENBSD || OSX
+#elif defined(FREEBSD) || defined(OPENBSD) || defined(DARWIN)
   return fsync (h->fd) == -1 ? GNUNET_SYSERR : GNUNET_OK;
 #else
   return fdatasync (h->fd) == -1 ? GNUNET_SYSERR : GNUNET_OK;

diff --git a/src/util/network.c b/src/util/network.c
index f3bf7ae837e0b52195d5460c8c0d2d3d3b8a7d9b..7039ff54aa8b8ac3feb95af4b4c3bdc62eb22e8a 100644 (file)
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -124,7 +124,7 @@ socket_set_inheritable (const struct GNUNET_NETWORK_Handle
 \r
 \r
 \r
-#ifdef OSX\r
+#ifdef DARWIN\r
 /**\r
  * The MSG_NOSIGNAL equivalent on Mac OS X\r
  *\r
@@ -204,7 +204,7 @@ GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc,
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,\r
                         "socket_set_inheritable");\r
 #endif\r
-#ifdef OSX\r
+#ifdef DARWIN\r
   socket_set_nosigpipe (ret);  \r
 #endif\r
   socket_set_nodelay (ret);\r
@@ -500,7 +500,7 @@ GNUNET_NETWORK_socket_create (int domain, int type, int protocol)
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,\r
                         "socket_set_inheritable");\r
 #endif\r
-#ifdef OSX\r
+#ifdef DARWIN\r
   socket_set_nosigpipe (ret);  \r
 #endif\r
   if (type == SOCK_STREAM)\r

diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index a8789281e316393baf631b10c03467c985ad1605..f27d195c3a4b63cbac1b6a4e4035fd5b74fea954 100644 (file)
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -42,7 +42,7 @@ extern "C"
 #include "gnunet_configuration_lib.h"
 #include "gnunet_disk_lib.h"
 #include "gnunet_os_lib.h"
-#if OSX
+#if DARWIN
 #include <mach-o/ldsyms.h>
 #include <mach-o/dyld.h>
 #endif
@@ -137,7 +137,7 @@ get_path_from_module_filename ()
 }
 #endif
 
-#if OSX
+#if DARWIN
 typedef int (*MyNSGetExecutablePathProto) (char *buf, size_t * bufsize);
 
 static char *
@@ -285,7 +285,7 @@ os_get_gnunet_path ()
   if (ret != NULL)
     return ret;
 #endif
-#if OSX
+#if DARWIN
   ret = get_path_from_dyld_image ();
   if (ret != NULL)
     return ret;
@@ -325,7 +325,7 @@ os_get_exec_path ()
   if (ret != NULL)
     return ret;
 #endif
-#if OSX
+#if DARWIN
   ret = get_path_from_NSGetExecutablePath ();
   if (ret != NULL)
     return ret;

diff --git a/src/util/os_load.c b/src/util/os_load.c
index a5a197ebefea4949eb22bbd842d1eb2a46359747..e2ec8349c3aec70a1914f8161715ec85141a7afd 100644 (file)
--- a/src/util/os_load.c
+++ b/src/util/os_load.c
@@ -49,7 +49,7 @@
 #endif
 #endif
 
-#ifdef OSX
+#ifdef DARWIN
 #include <mach/mach.h>
 
 static processor_cpu_load_info_t prev_cpu_load;
@@ -76,7 +76,7 @@ static int currentIOLoad;
 
 static double agedIOLoad = -1;
 
-#ifdef OSX
+#ifdef DARWIN
 static int
 initMachCpuStats ()
 {
@@ -196,7 +196,7 @@ updateUsage ()
     }
 #endif
 
-#ifdef OSX
+#ifdef DARWIN
   {
     unsigned int cpu_count;
     processor_cpu_load_info_t cpu_load;
@@ -284,7 +284,7 @@ updateUsage ()
         vm_deallocate (mach_task_self (),
                        (vm_address_t) cpu_load,
                        (vm_size_t) (cpu_msg_count * sizeof (*cpu_load)));
-        currentIOLoad = -1;     /* FIXME-OSX! */
+        currentIOLoad = -1;     /* There's no IO load meter on darwin */
         return GNUNET_OK;
       }
     else
@@ -623,7 +623,7 @@ void __attribute__ ((constructor)) GNUNET_cpustats_ltdl_init ()
   proc_stat = fopen ("/proc/stat", "r");
   if (NULL == proc_stat)
     GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "fopen", "/proc/stat");
-#elif OSX
+#elif defined(DARWIN)
   initMachCpuStats ();
 #elif MINGW
   InitWinEnv (NULL);
@@ -642,7 +642,7 @@ void __attribute__ ((destructor)) GNUNET_cpustats_ltdl_fini ()
       fclose (proc_stat);
       proc_stat = NULL;
     }
-#elif OSX
+#elif defined(DARWIN)
   GNUNET_free_non_null (prev_cpu_load);
 #elif MINGW
   ShutdownWinEnv ();