[pkgsrc/trunk]: pkgsrc Fix inline usage.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Fix inline usage.
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 12:20:53 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/d13b9bbc38ef
branches:  trunk
changeset: 603365:d13b9bbc38ef
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri May 04 16:36:10 2012 +0000

description:
Fix inline usage.

diffstat:

 wm/afterstep/distinfo                                  |  13 +++++++++-
 wm/afterstep/patches/patch-libAfterBase_ashash.c       |  22 ++++++++++++++++++
 wm/afterstep/patches/patch-libAfterBase_ashash.h       |  15 ++++++++++++
 wm/afterstep/patches/patch-libAfterBase_asvector.c     |  22 ++++++++++++++++++
 wm/afterstep/patches/patch-libAfterBase_asvector.h     |  13 ++++++++++
 wm/afterstep/patches/patch-libAfterImage_asfont.c      |  13 ++++++++++
 wm/afterstep/patches/patch-libAfterStep_functions.c    |  13 ++++++++++
 wm/afterstep/patches/patch-libAfterStep_functions.h    |  13 ++++++++++
 wm/afterstep/patches/patch-libAfterStep_mylook.c       |  22 ++++++++++++++++++
 wm/afterstep/patches/patch-libAfterStep_mylook.h       |  17 +++++++++++++
 wm/afterstep/patches/patch-src_afterstep_asinternals.h |  15 ++++++++++++
 wm/afterstep/patches/patch-src_afterstep_misc.c        |  21 +++++++++++++++++
 www/SpeedyCGI/distinfo                                 |   3 +-
 www/SpeedyCGI/patches/patch-src_speedy__inc.h          |  16 +++++++++++++
 14 files changed, 216 insertions(+), 2 deletions(-)

diffs (291 lines):

diff -r d41e678bea4e -r d13b9bbc38ef wm/afterstep/distinfo
--- a/wm/afterstep/distinfo     Fri May 04 16:34:48 2012 +0000
+++ b/wm/afterstep/distinfo     Fri May 04 16:36:10 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2011/05/25 13:17:37 obache Exp $
+$NetBSD: distinfo,v 1.15 2012/05/04 16:36:10 joerg Exp $
 
 SHA1 (AfterStep-2.1.2.tar.bz2) = c367e7c73561ddf03b3725f80d2f39f50d2b45bd
 RMD160 (AfterStep-2.1.2.tar.bz2) = f891ded642b9190bd261f3e3f92cb595da2d785b
@@ -6,6 +6,17 @@
 SHA1 (patch-aa) = c903ca64b609e4270ead1f1e03cb6ea962b294f8
 SHA1 (patch-ab) = b513b41f5be32170c3e7027d53e44625cbb4958a
 SHA1 (patch-ac) = bbf8b111e335941f5cf8f3fab28c1e1dcc884713
+SHA1 (patch-libAfterBase_ashash.c) = 456fd727d09764cf58b9eddda73a2edfb01e67c8
+SHA1 (patch-libAfterBase_ashash.h) = 28d9ce2613fce96e8e47a4a0dd3474dc2aa92f35
+SHA1 (patch-libAfterBase_asvector.c) = 898015f262199e44a8c03c3cd8abf8a231e696d1
+SHA1 (patch-libAfterBase_asvector.h) = 01290a2ca24a45afdb91ff2b0dcab419441725c6
+SHA1 (patch-libAfterImage_asfont.c) = 01326b222d398228e4908427ec603d5e1f63cf98
 SHA1 (patch-libAfterImage_export.c) = 0b450561673cb3351c2f8685ba7357cc6a1de366
 SHA1 (patch-libAfterImage_import.c) = b8651c189e49c41eeff91bbd3498b79cdb0a7496
+SHA1 (patch-libAfterStep_functions.c) = ae5b9aeca0046d034a59188cc9977e55605a2b7c
+SHA1 (patch-libAfterStep_functions.h) = 501e1a95419a8933b918f7d8df28df38e810f69a
+SHA1 (patch-libAfterStep_mylook.c) = 56dea9a5acb65dee3faa5adf350c8901bbd495e2
+SHA1 (patch-libAfterStep_mylook.h) = 8fede622d4737510880b88c3cf4b94f13e4892f1
 SHA1 (patch-src_ASDocGen_Makefile.in) = 36185b1db36dfda33ef1503d55855e9bbf1ea286
+SHA1 (patch-src_afterstep_asinternals.h) = c19f912d19635dba8c8e07e9ccf7b7463728c9ef
+SHA1 (patch-src_afterstep_misc.c) = 5aad3beb297d64896f286a1eebc5f0d931993c3f
diff -r d41e678bea4e -r d13b9bbc38ef wm/afterstep/patches/patch-libAfterBase_ashash.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/afterstep/patches/patch-libAfterBase_ashash.c  Fri May 04 16:36:10 2012 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-libAfterBase_ashash.c,v 1.1 2012/05/04 16:36:10 joerg Exp $
+
+--- libAfterBase/ashash.c.orig 2012-05-04 14:37:05.000000000 +0000
++++ libAfterBase/ashash.c
+@@ -503,7 +503,7 @@ remove_curr_hash_item (ASHashIterator * 
+               }
+ }
+ 
+-inline ASHashableValue
++ASHashableValue
+ curr_hash_value (ASHashIterator * iterator)
+ {
+       if (iterator)
+@@ -514,7 +514,7 @@ curr_hash_value (ASHashIterator * iterat
+       return (ASHashableValue) ((char *)NULL);
+ }
+ 
+-inline void         *
++void         *
+ curr_hash_data (ASHashIterator * iterator)
+ {
+       if (iterator)
diff -r d41e678bea4e -r d13b9bbc38ef wm/afterstep/patches/patch-libAfterBase_ashash.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/afterstep/patches/patch-libAfterBase_ashash.h  Fri May 04 16:36:10 2012 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-libAfterBase_ashash.h,v 1.1 2012/05/04 16:36:10 joerg Exp $
+
+--- libAfterBase/ashash.h.orig 2012-05-04 14:37:03.000000000 +0000
++++ libAfterBase/ashash.h
+@@ -133,8 +133,8 @@ unsigned long list_hash_items (ASHashTab
+ 
+ Bool start_hash_iteration (ASHashTable * hash, ASHashIterator * iterator);
+ Bool next_hash_item (ASHashIterator * iterator);
+-inline ASHashableValue curr_hash_value (ASHashIterator * iterator);
+-inline void *curr_hash_data (ASHashIterator * iterator);
++ASHashableValue curr_hash_value (ASHashIterator * iterator);
++void *curr_hash_data (ASHashIterator * iterator);
+ void remove_curr_hash_item (ASHashIterator * iterator, Bool destroy);
+ 
+ 
diff -r d41e678bea4e -r d13b9bbc38ef wm/afterstep/patches/patch-libAfterBase_asvector.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/afterstep/patches/patch-libAfterBase_asvector.c        Fri May 04 16:36:10 2012 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-libAfterBase_asvector.c,v 1.1 2012/05/04 16:36:10 joerg Exp $
+
+--- libAfterBase/asvector.c.orig       2012-05-04 14:36:35.000000000 +0000
++++ libAfterBase/asvector.c
+@@ -126,7 +126,7 @@ LOCAL_DEBUG_CALLER_OUT("0x%lX, 0x%lX, %l
+ 
+ /* finds index of the first element in the vector that is exactly matching specifyed
+  * data */
+-inline size_t vector_find_data( ASVector *v, void *data )
++size_t vector_find_data( ASVector *v, void *data )
+ {
+     register int i ;
+     /* word copying is usually faster then raw memory copying */
+@@ -170,7 +170,7 @@ inline size_t vector_find_data( ASVector
+     return i;
+ }
+ 
+-inline void vector_move_data_up( ASVector *v, int index, int offset, int length )
++static void vector_move_data_up( ASVector *v, int index, int offset, int length )
+ {
+     register int i ;
+     /* word copying is usually faster then raw memory copying */
diff -r d41e678bea4e -r d13b9bbc38ef wm/afterstep/patches/patch-libAfterBase_asvector.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/afterstep/patches/patch-libAfterBase_asvector.h        Fri May 04 16:36:10 2012 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-libAfterBase_asvector.h,v 1.1 2012/05/04 16:36:10 joerg Exp $
+
+--- libAfterBase/asvector.h.orig       2012-05-04 14:36:33.000000000 +0000
++++ libAfterBase/asvector.h
+@@ -38,7 +38,7 @@ ASVector *append_vector( ASVector *v, vo
+ /* returns index on success, -1 on failure */
+ int vector_insert_elem( ASVector *v, void *data, size_t size, void *sibling, int before );
+ int vector_relocate_elem( ASVector *v, void *data, unsigned int new_index );
+-inline size_t vector_find_data( ASVector *v, void *data );
++size_t vector_find_data( ASVector *v, void *data );
+ int vector_find_elem( ASVector *v, void *data );
+ /* returns 1 on success, 0 on failure */
+ int vector_remove_elem( ASVector *v, void *data );
diff -r d41e678bea4e -r d13b9bbc38ef wm/afterstep/patches/patch-libAfterImage_asfont.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/afterstep/patches/patch-libAfterImage_asfont.c Fri May 04 16:36:10 2012 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-libAfterImage_asfont.c,v 1.1 2012/05/04 16:36:10 joerg Exp $
+
+--- libAfterImage/asfont.c.orig        2012-05-04 14:38:20.000000000 +0000
++++ libAfterImage/asfont.c
+@@ -1352,7 +1352,7 @@ utf8_to_unicode ( const unsigned char *s
+     return 0;
+ }
+ 
+-inline ASGlyph *get_utf8_glyph( const char *utf8, ASFont *font )
++static ASGlyph *get_utf8_glyph( const char *utf8, ASFont *font )
+ {
+       UNICODE_CHAR uc = utf8_to_unicode ( (const unsigned char*)utf8 );
+       return get_unicode_glyph( uc, font );
diff -r d41e678bea4e -r d13b9bbc38ef wm/afterstep/patches/patch-libAfterStep_functions.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/afterstep/patches/patch-libAfterStep_functions.c       Fri May 04 16:36:10 2012 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-libAfterStep_functions.c,v 1.1 2012/05/04 16:36:10 joerg Exp $
+
+--- libAfterStep/functions.c.orig      2012-05-04 14:34:35.000000000 +0000
++++ libAfterStep/functions.c
+@@ -314,7 +314,7 @@ dup_func_data (FunctionData * dst, Funct
+     }
+ }
+ 
+-inline FunctionData *
++FunctionData *
+ create_named_function( int func, char *name)
+ {
+     FunctionData *fdata = safecalloc( 1, sizeof(FunctionData) );
diff -r d41e678bea4e -r d13b9bbc38ef wm/afterstep/patches/patch-libAfterStep_functions.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/afterstep/patches/patch-libAfterStep_functions.h       Fri May 04 16:36:10 2012 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-libAfterStep_functions.h,v 1.1 2012/05/04 16:36:10 joerg Exp $
+
+--- libAfterStep/functions.h.orig      2012-05-04 14:34:21.000000000 +0000
++++ libAfterStep/functions.h
+@@ -250,7 +250,7 @@ FunctionData *String2Func ( const char *
+ void init_func_data (FunctionData * data);
+ void copy_func_data (FunctionData * dst, FunctionData * src);
+ void dup_func_data (FunctionData * dst, FunctionData * src);
+-inline FunctionData *create_named_function( int func, char *name);
++FunctionData *create_named_function( int func, char *name);
+ void set_func_val (FunctionData * data, int arg, int value);
+ int free_func_data (FunctionData * data);
+ void destroy_func_data( FunctionData **pdata );
diff -r d41e678bea4e -r d13b9bbc38ef wm/afterstep/patches/patch-libAfterStep_mylook.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/afterstep/patches/patch-libAfterStep_mylook.c  Fri May 04 16:36:10 2012 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-libAfterStep_mylook.c,v 1.1 2012/05/04 16:36:11 joerg Exp $
+
+--- libAfterStep/mylook.c.orig 2012-05-04 14:35:51.000000000 +0000
++++ libAfterStep/mylook.c
+@@ -813,7 +813,7 @@ mylook_get_style(MyLook *look, const cha
+     return NULL;
+ }
+ 
+-inline MyDesktopConfig *
++MyDesktopConfig *
+ mylook_get_desk_config(MyLook *look, long desk)
+ {
+     if( look )
+@@ -827,7 +827,7 @@ mylook_get_desk_config(MyLook *look, lon
+ }
+ 
+ 
+-inline MyBackground *
++MyBackground *
+ mylook_get_desk_back(MyLook *look, long desk)
+ {
+       MyBackground *myback = NULL ;
diff -r d41e678bea4e -r d13b9bbc38ef wm/afterstep/patches/patch-libAfterStep_mylook.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/afterstep/patches/patch-libAfterStep_mylook.h  Fri May 04 16:36:10 2012 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-libAfterStep_mylook.h,v 1.1 2012/05/04 16:36:11 joerg Exp $
+
+--- libAfterStep/mylook.h.orig 2012-05-04 14:35:54.000000000 +0000
++++ libAfterStep/mylook.h
+@@ -401,9 +401,9 @@ void mylook_destroy (MyLook ** look);
+ 
+ 
+ struct MyStyle *mylook_get_style(MyLook *look, const char *name);
+-inline MyBackground  *mylook_get_desk_back(MyLook *look, long desk);
+-inline MyBackground  *mylook_get_back(MyLook *look, char *name);
+-inline MyDesktopConfig *mylook_get_desk_config(MyLook *look, long desk);
++MyBackground  *mylook_get_desk_back(MyLook *look, long desk);
++MyBackground  *mylook_get_back(MyLook *look, char *name);
++MyDesktopConfig *mylook_get_desk_config(MyLook *look, long desk);
+ 
+ 
+ 
diff -r d41e678bea4e -r d13b9bbc38ef wm/afterstep/patches/patch-src_afterstep_asinternals.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/afterstep/patches/patch-src_afterstep_asinternals.h    Fri May 04 16:36:10 2012 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_afterstep_asinternals.h,v 1.1 2012/05/04 16:36:11 joerg Exp $
+
+--- src/afterstep/asinternals.h.orig   2012-05-04 14:35:02.000000000 +0000
++++ src/afterstep/asinternals.h
+@@ -607,8 +607,8 @@ void ParsePopupEntry (char *tline, FILE 
+ 
+ 
+ /*************************** misc.c *********************************/
+-inline void ungrab_window_buttons( Window w );
+-inline void ungrab_window_keys (Window w );
++void ungrab_window_buttons( Window w );
++void ungrab_window_keys (Window w );
+ void MyXGrabButton ( unsigned button, unsigned modifiers,
+                 Window grab_window, Bool owner_events, unsigned event_mask,
+                 int pointer_mode, int keyboard_mode, Window confine_to, Cursor cursor);
diff -r d41e678bea4e -r d13b9bbc38ef wm/afterstep/patches/patch-src_afterstep_misc.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/afterstep/patches/patch-src_afterstep_misc.c   Fri May 04 16:36:10 2012 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-src_afterstep_misc.c,v 1.1 2012/05/04 16:36:11 joerg Exp $
+
+--- src/afterstep/misc.c.orig  2012-05-04 14:35:08.000000000 +0000
++++ src/afterstep/misc.c
+@@ -32,14 +32,14 @@
+ /****************************************************************************/
+ /* window management specifics - button ungrabbing convinience functions:   */
+ /****************************************************************************/
+-inline void
++void
+ ungrab_window_buttons( Window w )
+ {
+       LOCAL_DEBUG_OUT( "w = %lX", w );
+     XUngrabButton (dpy, AnyButton, AnyModifier, w);
+ }
+ 
+-inline void
++void
+ ungrab_window_keys (Window w )
+ {
+     XUngrabKey (dpy, AnyKey, AnyModifier, w);
diff -r d41e678bea4e -r d13b9bbc38ef www/SpeedyCGI/distinfo
--- a/www/SpeedyCGI/distinfo    Fri May 04 16:34:48 2012 +0000
+++ b/www/SpeedyCGI/distinfo    Fri May 04 16:36:10 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2008/10/20 20:41:47 adrianp Exp $
+$NetBSD: distinfo,v 1.5 2012/05/04 16:37:19 joerg Exp $
 
 SHA1 (CGI-SpeedyCGI-2.22.tar.gz) = 155437a83eedc2cb1ae2b9f93a731a0cfb7ce7f2
 RMD160 (CGI-SpeedyCGI-2.22.tar.gz) = 90bc10281f4380d6d9e3b376ce385567fb3d165d
@@ -7,3 +7,4 @@
 SHA1 (patch-ab) = dc6c90c52a855280824738e98301560640932cfa
 SHA1 (patch-ac) = ada49b40a665f28656a238b2b7566980d1736f24
 SHA1 (patch-ad) = 099ebd36ffb48da38e0af21416f427afb0ed9012
+SHA1 (patch-src_speedy__inc.h) = d2bf220fe6aa0ec39a2276453cc1555899e9254c
diff -r d41e678bea4e -r d13b9bbc38ef www/SpeedyCGI/patches/patch-src_speedy__inc.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/SpeedyCGI/patches/patch-src_speedy__inc.h     Fri May 04 16:36:10 2012 +0000
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_speedy__inc.h,v 1.1 2012/05/04 16:37:19 joerg Exp $
+
+--- src/speedy_inc.h.orig      2012-05-04 14:07:56.000000000 +0000
++++ src/speedy_inc.h
+@@ -41,11 +41,7 @@ typedef long long speedy_ino_t;
+ #   define MAP_FAILED (-1)
+ #endif
+ 
+-#ifdef __GNUC__
+-#define SPEEDY_INLINE __inline__
+-#else
+ #define SPEEDY_INLINE
+-#endif
+ 
+ #ifdef EWOULDBLOCK
+ #   define SP_EWOULDBLOCK(e) ((e) == EWOULDBLOCK)
Prev by Date: [pkgsrc/trunk]: pkgsrc/textproc/catdoc Update MASTER_SITES and HOMEPAGE.
Next by Date: [pkgsrc/trunk]: pkgsrc/x11/modular-xorg-server Just use AT&T assembler syntax...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/textproc/catdoc Update MASTER_SITES and HOMEPAGE.
Next by Thread: [pkgsrc/trunk]: pkgsrc/x11/modular-xorg-server Just use AT&T assembler syntax...
Indexes:
Home | Main Index | Thread Index | Old Index