From ed04629301dd32437d5ce0cde4d996ad2fc5fd99 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sun, 16 Oct 2016 16:44:23 -0400 Subject: [PATCH] ustr: Import patches I forgot to commit Signed-off-by: Michael Tremer --- ustr/patches/c99-inline.patch | 30 ++++++++++++++++++++++++++++++ ustr/ustr.nm | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 ustr/patches/c99-inline.patch diff --git a/ustr/patches/c99-inline.patch b/ustr/patches/c99-inline.patch new file mode 100644 index 000000000..dfa021fdd --- /dev/null +++ b/ustr/patches/c99-inline.patch @@ -0,0 +1,30 @@ +diff -rup ustr-1.0.4-orig/ustr-compiler.h ustr-1.0.4/ustr-compiler.h +--- ustr-1.0.4-orig/ustr-compiler.h 2008-02-15 15:12:28.000000000 -0500 ++++ ustr-1.0.4/ustr-compiler.h 2008-06-13 15:25:18.000000000 -0400 +@@ -113,17 +113,23 @@ + #endif + + #ifndef USTR_CONF_EI_PROTO /* external inline */ +-# if USTR_CONF_INCLUDE_CODEONLY_HEADERS ++# if USTR_CONF_INCLUDE_CODEONLY_HEADERS || ! defined(__GNUC__) || \ ++ ! USTR_CONF_COMPILE_USE_INLINE + # define USTR_CONF_EI_PROTO static USTR__INLINE + # else + # define USTR_CONF_EI_PROTO extern + # endif + #endif + #ifndef USTR_CONF_II_PROTO /* implementation of inline */ +-# if USTR_CONF_INCLUDE_CODEONLY_HEADERS ++# if USTR_CONF_INCLUDE_CODEONLY_HEADERS || ! defined(__GNUC__) || \ ++ ! USTR_CONF_COMPILE_USE_INLINE + # define USTR_CONF_II_PROTO static USTR__INLINE + # else +-# define USTR_CONF_II_PROTO extern inline ++# if defined(__GNUC_STDC_INLINE__) || defined(__GNUC_GNU_INLINE__) ++# define USTR_CONF_II_PROTO extern inline __attribute__ ((__gnu_inline__)) ++# else ++# define USTR_CONF_II_PROTO extern inline ++# endif + # endif + #endif + diff --git a/ustr/ustr.nm b/ustr/ustr.nm index 7db2a1e46..9e12f8edf 100644 --- a/ustr/ustr.nm +++ b/ustr/ustr.nm @@ -5,7 +5,7 @@ name = ustr version = 1.0.4 -release = 3 +release = 3.1 groups = System/Libraries url = http://www.and.org/ustr/