[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet-fuse] branch master updated: remove some ancient defines from gn
From: |
gnunet |
Subject: |
[gnunet-fuse] branch master updated: remove some ancient defines from gnunet. use BSD define from sys/param.h in mutex.c. |
Date: |
Tue, 19 Nov 2019 19:16:19 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnunet-fuse.
The following commit(s) were added to refs/heads/master by this push:
new c338938 remove some ancient defines from gnunet. use BSD define from
sys/param.h in mutex.c.
c338938 is described below
commit c338938b3e76a23a95a9ec1a6be28ed48373268f
Author: ng0 <address@hidden>
AuthorDate: Tue Nov 19 18:11:33 2019 +0000
remove some ancient defines from gnunet. use BSD define from
sys/param.h in mutex.c.
---
configure.ac | 16 +++++++---------
src/fuse/mutex.c | 4 ++--
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/configure.ac b/configure.ac
index 42ff5dd..e4c1a73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
# This file is part of GNUnet.
-# (C) 2001-2013 Christian Grothoff (and other contributing authors)
+# (C) 2001-2013, 2019 Christian Grothoff (and other contributing authors)
#
# GNUnet is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published
@@ -62,16 +62,13 @@ linux*)
AC_DEFINE_UNQUOTED(LINUX,1,[This is a Linux system])
;;
freebsd*)
- AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
- AC_DEFINE_UNQUOTED(FREEBSD,1,[This is a FreeBSD system])
+ build_target="freebsd"
;;
openbsd*)
- AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
- AC_DEFINE_UNQUOTED(OPENBSD,1,[This is an OpenBSD system])
+ build_target="openbsd"
;;
netbsd*)
- AC_DEFINE_UNQUOTED(SOMEBSD,1,[This is a BSD system])
- AC_DEFINE_UNQUOTED(NETBSD,1,[This is a NetBSD system])
+ build_target="netbsd"
;;
*solaris*)
AC_DEFINE_UNQUOTED(SOLARIS,1,[This is a Solaris system])
@@ -109,7 +106,7 @@ AM_CONDITIONAL(MINGW, test "$build_target" = "mingw")
AM_GNU_GETTEXT_VERSION([0.19.4])
AM_GNU_GETTEXT([external])
-AC_CHECK_HEADERS([errno.h stdio.h unistd.h locale.h sys/stat.h sys/types.h
langinfo.h libintl.h unistd.h stddef.h argz.h sys/socket.h netinet/in.h
stdarg.h])
+AC_CHECK_HEADERS([errno.h stdio.h unistd.h locale.h sys/stat.h sys/types.h
langinfo.h libintl.h unistd.h stddef.h argz.h sys/socket.h netinet/in.h
stdarg.h sys/param.h])
backup_LIBS="$LIBS"
backup_CFLAGS="$CFLAGS "
@@ -181,8 +178,9 @@ AC_DEFINE_DIR([PACKAGE_DATA], [datarootdir], [The directory
for installing read-
packagesrcdir=`cd $srcdir && pwd`
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [source dir])
-AC_OUTPUT([ po/Makefile.in
+AC_OUTPUT([
Makefile
+po/Makefile.in
doc/Makefile
src/Makefile
src/fuse/Makefile
diff --git a/src/fuse/mutex.c b/src/fuse/mutex.c
index ba526e8..24c7036 100644
--- a/src/fuse/mutex.c
+++ b/src/fuse/mutex.c
@@ -26,7 +26,7 @@
#include "mutex.h"
#include <pthread.h>
-#if SOMEBSD
+#if BSD
# include <pthread_np.h>
#endif
@@ -73,7 +73,7 @@ GNUNET_mutex_create (int isRecursive)
#if LINUX
GNUNET_assert (0 == pthread_mutexattr_setkind_np
(&attr, PTHREAD_MUTEX_RECURSIVE_NP));
-#elif SOMEBSD || GNUNET_freeBSD || GNUNET_freeBSD5
+#elif BSD
GNUNET_assert (0 == pthread_mutexattr_setkind_np
(&attr, PTHREAD_MUTEX_RECURSIVE));
#elif SOLARIS || OSX || WINDOWS
--
To stop receiving notification emails like this one, please contact
address@hidden.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet-fuse] branch master updated: remove some ancient defines from gnunet. use BSD define from sys/param.h in mutex.c.,
gnunet <=