[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7147 - in GNUnet/src: include util/network util/os
From: |
gnunet |
Subject: |
[GNUnet-SVN] r7147 - in GNUnet/src: include util/network util/os |
Date: |
Wed, 11 Jun 2008 23:49:44 -0600 (MDT) |
Author: grothoff
Date: 2008-06-11 23:49:44 -0600 (Wed, 11 Jun 2008)
New Revision: 7147
Modified:
GNUnet/src/include/platform.h
GNUnet/src/util/network/io.c
GNUnet/src/util/os/semaphore.c
Log:
fixing problems on OpenBSD
Modified: GNUnet/src/include/platform.h
===================================================================
--- GNUnet/src/include/platform.h 2008-06-12 05:37:56 UTC (rev 7146)
+++ GNUnet/src/include/platform.h 2008-06-12 05:49:44 UTC (rev 7147)
@@ -81,7 +81,6 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netinet/tcp.h>
-#include <netinet/in.h>
#include <pwd.h>
#include <sys/ioctl.h>
#include <sys/wait.h>
Modified: GNUnet/src/util/network/io.c
===================================================================
--- GNUnet/src/util/network/io.c 2008-06-12 05:37:56 UTC (rev 7146)
+++ GNUnet/src/util/network/io.c 2008-06-12 05:49:44 UTC (rev 7147)
@@ -129,7 +129,7 @@
}
/* TODO: log errors! */
-#if OSX || SOMEBSD
+#if OSX || FREEBSD
static int
socket_set_nosigpipe (struct GNUNET_SocketHandle *s, int dontSigPipe)
{
@@ -206,7 +206,7 @@
#ifdef CYGWIN
if (0 == (nc & GNUNET_NC_IGNORE_INT))
flags |= MSG_NOSIGNAL;
-#elif OSX || SOMEBSD
+#elif OSX || FREEBSD
socket_set_nosigpipe (s, 0 == (nc & GNUNET_NC_IGNORE_INT));
if (0 == (nc & GNUNET_NC_BLOCKING))
flags |= MSG_DONTWAIT;
@@ -290,7 +290,7 @@
#ifdef CYGWIN
if (0 == (nc & GNUNET_NC_IGNORE_INT))
flags |= MSG_NOSIGNAL;
-#elif OSX || SOMEBSD
+#elif OSX || FREEBSD
socket_set_nosigpipe (s, 0 == (nc & GNUNET_NC_IGNORE_INT));
if (0 == (nc & GNUNET_NC_BLOCKING))
flags |= MSG_DONTWAIT;
@@ -366,7 +366,7 @@
#if SOLARIS
if (0 == (nc & GNUNET_NC_BLOCKING))
flags |= MSG_DONTWAIT;
-#elif OSX || SOMEBSD
+#elif OSX || FREEBSD
socket_set_nosigpipe (s, 0 == (nc & GNUNET_NC_IGNORE_INT));
if (0 == (nc & GNUNET_NC_BLOCKING))
flags |= MSG_DONTWAIT;
@@ -443,7 +443,7 @@
#if SOLARIS
if (0 == (nc & GNUNET_NC_BLOCKING))
flags |= MSG_DONTWAIT;
-#elif OSX || SOMEBSD
+#elif OSX || FREEBSD
socket_set_nosigpipe (s, 0 == (nc & GNUNET_NC_IGNORE_INT));
if (0 == (nc & GNUNET_NC_BLOCKING))
flags |= MSG_DONTWAIT;
Modified: GNUnet/src/util/os/semaphore.c
===================================================================
--- GNUnet/src/util/os/semaphore.c 2008-06-12 05:37:56 UTC (rev 7146)
+++ GNUnet/src/util/os/semaphore.c 2008-06-12 05:49:44 UTC (rev 7147)
@@ -315,7 +315,7 @@
ret = GNUNET_malloc (sizeof (struct GNUNET_IPC_Semaphore));
ret->ectx = ectx;
- GNUNET_mutex_create (&ret->internalLock);
+ ret->internalLock = GNUNET_mutex_create (GNUNET_NO);
ret->filename = GNUNET_strdup (basename);
fd = -1;
while (fd == -1)
@@ -341,7 +341,7 @@
GNUNET_GE_LOG_STRERROR_FILE (ectx,
GNUNET_GE_ERROR | GNUNET_GE_USER |
GNUNET_GE_BULK, "open", ret->filename);
- GNUNET_mutex_destroy (&ret->internalLock);
+ GNUNET_mutex_destroy (ret->internalLock);
GNUNET_free (ret->filename);
GNUNET_free (ret);
return NULL;
@@ -408,7 +408,7 @@
{
int cnt;
- GNUNET_mutex_lock (&sem->internalLock);
+ GNUNET_mutex_lock(sem->internalLock);
FLOCK (sem->fd, LOCK_EX);
SEMA_LSEEK (sem->fd, 0, SEEK_SET);
if (sizeof (int) != READ (sem->fd, &cnt, sizeof (int)))
@@ -417,7 +417,7 @@
GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK, "read", sem->filename);
FLOCK (sem->fd, LOCK_UN);
- GNUNET_mutex_unlock (&sem->internalLock);
+ GNUNET_mutex_unlock (sem->internalLock);
return;
}
cnt = htonl (ntohl (cnt) + 1);
@@ -427,7 +427,7 @@
GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK, "write", sem->filename);
FLOCK (sem->fd, LOCK_UN);
- GNUNET_mutex_unlock (&sem->internalLock);
+ GNUNET_mutex_unlock (sem->internalLock);
}
#endif
}
@@ -472,7 +472,7 @@
{
int cnt;
- GNUNET_mutex_lock (&sem->internalLock);
+ GNUNET_mutex_lock (sem->internalLock);
FLOCK (sem->fd, LOCK_EX);
cnt = ntohl (0);
while (htonl (cnt) == 0)
@@ -485,7 +485,7 @@
GNUNET_GE_BULK, "read",
sem->filename);
FLOCK (sem->fd, LOCK_UN);
- GNUNET_mutex_unlock (&sem->internalLock);
+ GNUNET_mutex_unlock (sem->internalLock);
return GNUNET_SYSERR;
}
if (htonl (cnt) == 0)
@@ -504,7 +504,7 @@
GNUNET_GE_WARNING | GNUNET_GE_USER |
GNUNET_GE_BULK, "write", sem->filename);
FLOCK (sem->fd, LOCK_UN);
- GNUNET_mutex_unlock (&sem->internalLock);
+ GNUNET_mutex_unlock (sem->internalLock);
}
return GNUNET_OK;
#else
@@ -564,7 +564,7 @@
{
int cnt;
- GNUNET_mutex_destroy (&sem->internalLock);
+ GNUNET_mutex_destroy (sem->internalLock);
FLOCK (sem->fd, LOCK_EX);
SEMA_LSEEK (sem->fd, sizeof (int), SEEK_SET);
if (sizeof (int) == READ (sem->fd, &cnt, sizeof (int)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7147 - in GNUnet/src: include util/network util/os,
gnunet <=