From 07d2afe861142b47025207c1834225932ba6e690 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 15 Jul 2015 13:17:09 +0000 Subject: [PATCH] -downgrade version requirement further --- configure.ac | 2 +- m4/extern-inline.m4 | 45 ++++++-------------------------- src/include/gnunet_disk_lib.h | 15 ++++++----- src/include/gnunet_strings_lib.h | 2 +- 4 files changed, 18 insertions(+), 46 deletions(-) diff --git a/configure.ac b/configure.ac index b8bc61947..9ae80398f 100644 --- a/configure.ac +++ b/configure.ac @@ -962,7 +962,7 @@ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :]) # check for gettext AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION([0.18.3]) +AM_GNU_GETTEXT_VERSION([0.18.1]) # Checks for standard typedefs, structures, and compiler characteristics. AC_TYPE_PID_T diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 index 7f1bb397c..c4c5e7f22 100644 --- a/m4/extern-inline.m4 +++ b/m4/extern-inline.m4 @@ -1,6 +1,6 @@ dnl 'extern inline' a la ISO C99. -dnl Copyright 2012-2014 Free Software Foundation, Inc. +dnl Copyright 2012-2013 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -19,56 +19,27 @@ AC_DEFUN([gl_EXTERN_INLINE], 'reference to static identifier "f" in extern inline function'. This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16. - Suppress extern inline (with or without __attribute__ ((__gnu_inline__))) - on configurations that mistakenly use 'static inline' to implement - functions or macros in standard C headers like . For example, - if isdigit is mistakenly implemented via a static inline function, - a program containing an extern inline function that calls isdigit - may not work since the C standard prohibits extern inline functions - from calling static functions. This bug is known to occur on: - - OS X 10.8 and earlier; see: - http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html - - DragonFly; see - http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log - - FreeBSD; see: - http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html - - OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and - for clang but remains for g++; see . - Assume DragonFly and FreeBSD will be similar. */ -#if (((defined __APPLE__ && defined __MACH__) \ - || defined __DragonFly__ || defined __FreeBSD__) \ - && (defined __header_inline \ - ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \ - && ! defined __clang__) \ - : ((! defined _DONT_USE_CTYPE_INLINE_ \ - && (defined __GNUC__ || defined __cplusplus)) \ - || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ - && defined __GNUC__ && ! defined __cplusplus)))) -# define _GL_EXTERN_INLINE_STDHEADER_BUG -#endif + Suppress the use of extern inline on Apple's platforms, as Libc at least + through Libc-825.26 (2013-04-09) is incompatible with it; see, e.g., + . + Perhaps Apple will fix this some day. */ #if ((__GNUC__ \ ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ : (199901L <= __STDC_VERSION__ \ && !defined __HP_cc \ && !(defined __SUNPRO_C && __STDC__))) \ - && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) + && !defined __APPLE__) # define _GL_INLINE inline # define _GL_EXTERN_INLINE extern inline -# define _GL_EXTERN_INLINE_IN_USE #elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \ - && !defined _GL_EXTERN_INLINE_STDHEADER_BUG) -# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__ + && !defined __APPLE__) +# if __GNUC_GNU_INLINE__ /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ # define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) # else # define _GL_INLINE extern inline # endif # define _GL_EXTERN_INLINE extern -# define _GL_EXTERN_INLINE_IN_USE #else # define _GL_INLINE static _GL_UNUSED # define _GL_EXTERN_INLINE static _GL_UNUSED diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h index ddb2369c2..4b38a31d6 100644 --- a/src/include/gnunet_disk_lib.h +++ b/src/include/gnunet_disk_lib.h @@ -344,7 +344,7 @@ GNUNET_DISK_file_size (const char *filename, uint64_t *size, * @param filename name of the file * @param dev set to the device ID * @param ino set to the inode ID - * @return GNUNET_OK on success + * @return #GNUNET_OK on success */ int GNUNET_DISK_file_get_identifiers (const char *filename, @@ -528,7 +528,6 @@ GNUNET_DISK_fix_permissions (const char *fn, int require_gid_match); - /** * Get a handle from a native integer FD. * @@ -646,7 +645,8 @@ GNUNET_DISK_fn_write (const char *fn, * @return #GNUNET_OK on success, #GNUNET_SYSERR on error */ int -GNUNET_DISK_file_copy (const char *src, const char *dst); +GNUNET_DISK_file_copy (const char *src, + const char *dst); /** @@ -679,10 +679,11 @@ struct GNUNET_DISK_DirectoryIterator; * @param filename complete filename (absolute path) * @param dirname directory name (absolute path) */ -typedef void (*GNUNET_DISK_DirectoryIteratorCallback) (void *cls, - struct GNUNET_DISK_DirectoryIterator *di, - const char *filename, - const char *dirname); +typedef void +(*GNUNET_DISK_DirectoryIteratorCallback) (void *cls, + struct GNUNET_DISK_DirectoryIterator *di, + const char *filename, + const char *dirname); /** diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h index f8f2a92d5..903b45ec5 100644 --- a/src/include/gnunet_strings_lib.h +++ b/src/include/gnunet_strings_lib.h @@ -316,7 +316,7 @@ GNUNET_STRINGS_data_to_string_alloc (const void *buf, * @a out_size must match exactly the size of the data before it was encoded. * * @param enc the encoding - * @param enclen number of characters in 'enc' (without 0-terminator, which can be missing) + * @param enclen number of characters in @a enc (without 0-terminator, which can be missing) * @param out location where to store the decoded data * @param out_size size of the output buffer @a out * @return #GNUNET_OK on success, #GNUNET_SYSERR if result has the wrong encoding -- 2.25.1