rpms/ustr/F-9 c99-inline.patch,NONE,1.1 ustr.spec,1.20,1.21

[James Antill (james)]

Author: james

Update of /cvs/pkgs/rpms/ustr/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23195

Modified Files:
	ustr.spec 
Added Files:
	c99-inline.patch 
Log Message:
* Fri Jun 13 2008 James Antill <james at fedoraproject.org> - 1.0.4-7
- Fix c99 inline problems, newer GCC


c99-inline.patch:

--- NEW FILE c99-inline.patch ---
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
 


Index: ustr.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ustr/F-9/ustr.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ustr.spec	10 Mar 2008 02:31:50 -0000	1.20
+++ ustr.spec	13 Jun 2008 19:27:36 -0000	1.21
@@ -27,13 +27,13 @@
 
 Name: ustr
 Version: 1.0.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: String library, very low memory overhead, simple to import
 Group: System Environment/Libraries
 License: MIT or LGPLv2+ or BSD
 URL: http://www.and.org/ustr/
 Source0: http://www.and.org/ustr/%{version}/%{name}-%{version}.tar.gz
-# Patch0: multilib-ustr-import.patch
+Patch0: c99-inline.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # BuildRequires: make gcc sed
 
@@ -86,7 +86,7 @@
 
 %prep
 %setup -q
-#patch0 -p1
+%patch0 -p1
 
 %build
 make %{?_smp_mflags} all-shared CFLAGS="${CFLAGS:-%optflags}" %{policy_cflags}
@@ -151,6 +151,9 @@
 
 
 %changelog
+* Fri Jun 13 2008 James Antill <james at fedoraproject.org> - 1.0.4-7
+- Fix c99 inline problems, newer GCC
+
 * Sun Mar  9 2008 James Antill <james at fedoraproject.org> - 1.0.4-6
 - Fix dir. ownership bug.
 - Resolves: rhbz#436711