[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r9167 - in gnunet: . src/include src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r9167 - in gnunet: . src/include src/util |
Date: |
Sun, 18 Oct 2009 00:28:54 -0600 |
Author: holindho
Date: 2009-10-18 00:28:49 -0600 (Sun, 18 Oct 2009)
New Revision: 9167
Modified:
gnunet/configure.ac
gnunet/src/include/platform.h
gnunet/src/util/disk.c
gnunet/src/util/network.c
gnunet/src/util/os_installation.c
gnunet/src/util/os_load.c
Log:
cosmetics
Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2009-10-18 05:10:41 UTC (rev 9166)
+++ gnunet/configure.ac 2009-10-18 06:28:49 UTC (rev 9167)
@@ -69,10 +69,10 @@
# 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_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")
Modified: gnunet/src/include/platform.h
===================================================================
--- gnunet/src/include/platform.h 2009-10-18 05:10:41 UTC (rev 9166)
+++ gnunet/src/include/platform.h 2009-10-18 06:28:49 UTC (rev 9167)
@@ -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
Modified: gnunet/src/util/disk.c
===================================================================
--- gnunet/src/util/disk.c 2009-10-18 05:10:41 UTC (rev 9166)
+++ gnunet/src/util/disk.c 2009-10-18 06:28:49 UTC (rev 9167)
@@ -41,17 +41,13 @@
-#if LINUX || CYGWIN
+#if defined(LINUX) || defined(CYGWIN)
#include <sys/vfs.h>
#else
-#ifdef SOMEBSD
+#if defined(SOMEBSD) || defined(DARWIN)
#include <sys/param.h>
#include <sys/mount.h>
#else
-#ifdef OSX
-#include <sys/param.h>
-#include <sys/mount.h>
-#else
#ifdef SOLARIS
#include <sys/types.h>
#include <sys/statvfs.h>
@@ -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 @@
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;
Modified: gnunet/src/util/network.c
===================================================================
--- gnunet/src/util/network.c 2009-10-18 05:10:41 UTC (rev 9166)
+++ gnunet/src/util/network.c 2009-10-18 06:28:49 UTC (rev 9167)
@@ -124,7 +124,7 @@
-#ifdef OSX
+#ifdef DARWIN
/**
* The MSG_NOSIGNAL equivalent on Mac OS X
*
@@ -204,7 +204,7 @@
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"socket_set_inheritable");
#endif
-#ifdef OSX
+#ifdef DARWIN
socket_set_nosigpipe (ret);
#endif
socket_set_nodelay (ret);
@@ -500,7 +500,7 @@
GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"socket_set_inheritable");
#endif
-#ifdef OSX
+#ifdef DARWIN
socket_set_nosigpipe (ret);
#endif
if (type == SOCK_STREAM)
Modified: gnunet/src/util/os_installation.c
===================================================================
--- gnunet/src/util/os_installation.c 2009-10-18 05:10:41 UTC (rev 9166)
+++ gnunet/src/util/os_installation.c 2009-10-18 06:28:49 UTC (rev 9167)
@@ -42,7 +42,7 @@
#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 @@
}
#endif
-#if OSX
+#if DARWIN
typedef int (*MyNSGetExecutablePathProto) (char *buf, size_t * bufsize);
static char *
@@ -285,7 +285,7 @@
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 @@
if (ret != NULL)
return ret;
#endif
-#if OSX
+#if DARWIN
ret = get_path_from_NSGetExecutablePath ();
if (ret != NULL)
return ret;
Modified: gnunet/src/util/os_load.c
===================================================================
--- gnunet/src/util/os_load.c 2009-10-18 05:10:41 UTC (rev 9166)
+++ gnunet/src/util/os_load.c 2009-10-18 06:28:49 UTC (rev 9167)
@@ -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 double agedIOLoad = -1;
-#ifdef OSX
+#ifdef DARWIN
static int
initMachCpuStats ()
{
@@ -196,7 +196,7 @@
}
#endif
-#ifdef OSX
+#ifdef DARWIN
{
unsigned int cpu_count;
processor_cpu_load_info_t cpu_load;
@@ -284,7 +284,7 @@
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 @@
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 @@
fclose (proc_stat);
proc_stat = NULL;
}
-#elif OSX
+#elif defined(DARWIN)
GNUNET_free_non_null (prev_cpu_load);
#elif MINGW
ShutdownWinEnv ();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r9167 - in gnunet: . src/include src/util,
gnunet <=