[packages/goldwater] - remove incorect inlining - rel 12

baggins baggins at pld-linux.org
Fri Oct 21 22:04:49 CEST 2016


commit e6db36efe842928d601d7e3be96b1ca3cd9ae47f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Oct 21 22:04:27 2016 +0200

    - remove incorect inlining
    - rel 12

 goldwater.spec  |  4 +++-
 no-inline.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)
---
diff --git a/goldwater.spec b/goldwater.spec
index baa16f6..d7d3313 100644
--- a/goldwater.spec
+++ b/goldwater.spec
@@ -2,7 +2,7 @@ Summary:	Messaging Middleware
 Summary(pl.UTF-8):	Oprogramowanie pośredniczące w komunikacji
 Name:		goldwater
 Version:	1.4.0
-Release:	11
+Release:	12
 License:	GPL
 Group:		Applications
 Source0:	http://www.nfluid.com/download/src/%{name}-%{version}.tgz
@@ -14,6 +14,7 @@ Patch3:		%{name}-pic.patch
 Patch4:		%{name}-make.patch
 Patch5:		%{name}-lvalue.patch
 Patch6:		%{name}-link.patch
+Patch7:		no-inline.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	expat-devel
@@ -83,6 +84,7 @@ Goldwater Messaging Middleware - statyczne biblioteki.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
diff --git a/no-inline.patch b/no-inline.patch
new file mode 100644
index 0000000..f5bf3f8
--- /dev/null
+++ b/no-inline.patch
@@ -0,0 +1,44 @@
+--- goldwater-1.4.0/netengine/pxlapi.h~	2003-03-29 13:21:11.000000000 +0100
++++ goldwater-1.4.0/netengine/pxlapi.h	2016-10-21 21:58:54.134124582 +0200
+@@ -42,7 +42,7 @@
+ void api_event_init();
+ void api_write_init( int block_size );
+ int  api_event_deinit();
+-__inline__ int  api_events_pending();
++int  api_events_pending();
+ 
+ void api_defcon_init( NetService *, NetworkConnectionData * );
+ 
+--- goldwater-1.4.0/netengine/xlapi.c~	2016-10-21 22:00:03.000000000 +0200
++++ goldwater-1.4.0/netengine/xlapi.c	2016-10-21 22:02:07.648921958 +0200
+@@ -123,7 +123,7 @@
+ /*
+  * Returns the number of events sitting in queue FAST INLINE VERSION
+  */
+-__inline__ int
++int
+ api_events_pending()
+ {
+   return EVT_MAX - xl_List_get_size( evb_pool );
+--- goldwater-1.4.0/gwlib/gwservice.c~	2003-04-10 18:18:25.000000000 +0200
++++ goldwater-1.4.0/gwlib/gwservice.c	2016-10-21 22:02:50.124763410 +0200
+@@ -188,7 +188,7 @@
+  * Registers service with the calling servers Request Queue, but against
+  * the supplied domain id
+  */
+-__inline__ int
++int
+ __gw_add_service_dom( const char *service, const char *function, int domid )
+ {
+   long pos        = 0;
+--- goldwater-1.4.0/gwlib/gwservice.h~	2003-03-29 13:21:11.000000000 +0100
++++ goldwater-1.4.0/gwlib/gwservice.h	2016-10-21 22:03:05.634511019 +0200
+@@ -60,7 +60,7 @@
+ RetValue  __gw_remove_services ( long, long, long, SHMLIST * );
+ RetValue  __gw_add_service( long, long, long, long, SHMLIST *, const char *, const char *, long *, ServiceFlags );
+ 
+-__inline__ int __gw_add_service_dom( const char *, const char *, int );
++int __gw_add_service_dom( const char *, const char *, int );
+ 
+ /* ------------------------------------------------------------------------- */
+ /* end */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/goldwater.git/commitdiff/e6db36efe842928d601d7e3be96b1ca3cd9ae47f



More information about the pld-cvs-commit mailing list