From 90ee0c7e48eb719be4b870e532de883797a2928b Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 4 May 2012 16:36:10 +0000 Subject: Fix inline usage. --- 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 +++++++++++++ .../patches/patch-libAfterStep_functions.c | 13 +++++++++++++ .../patches/patch-libAfterStep_functions.h | 13 +++++++++++++ wm/afterstep/patches/patch-libAfterStep_mylook.c | 22 ++++++++++++++++++++++ wm/afterstep/patches/patch-libAfterStep_mylook.h | 17 +++++++++++++++++ .../patches/patch-src_afterstep_asinternals.h | 15 +++++++++++++++ wm/afterstep/patches/patch-src_afterstep_misc.c | 21 +++++++++++++++++++++ 12 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 wm/afterstep/patches/patch-libAfterBase_ashash.c create mode 100644 wm/afterstep/patches/patch-libAfterBase_ashash.h create mode 100644 wm/afterstep/patches/patch-libAfterBase_asvector.c create mode 100644 wm/afterstep/patches/patch-libAfterBase_asvector.h create mode 100644 wm/afterstep/patches/patch-libAfterImage_asfont.c create mode 100644 wm/afterstep/patches/patch-libAfterStep_functions.c create mode 100644 wm/afterstep/patches/patch-libAfterStep_functions.h create mode 100644 wm/afterstep/patches/patch-libAfterStep_mylook.c create mode 100644 wm/afterstep/patches/patch-libAfterStep_mylook.h create mode 100644 wm/afterstep/patches/patch-src_afterstep_asinternals.h create mode 100644 wm/afterstep/patches/patch-src_afterstep_misc.c (limited to 'wm') diff --git a/wm/afterstep/distinfo b/wm/afterstep/distinfo index dbc447011a6..a84beec8881 100644 --- a/wm/afterstep/distinfo +++ b/wm/afterstep/distinfo @@ -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 @@ Size (AfterStep-2.1.2.tar.bz2) = 5079333 bytes 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 --git a/wm/afterstep/patches/patch-libAfterBase_ashash.c b/wm/afterstep/patches/patch-libAfterBase_ashash.c new file mode 100644 index 00000000000..e3e391b7c0e --- /dev/null +++ b/wm/afterstep/patches/patch-libAfterBase_ashash.c @@ -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 --git a/wm/afterstep/patches/patch-libAfterBase_ashash.h b/wm/afterstep/patches/patch-libAfterBase_ashash.h new file mode 100644 index 00000000000..a137a193f88 --- /dev/null +++ b/wm/afterstep/patches/patch-libAfterBase_ashash.h @@ -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 --git a/wm/afterstep/patches/patch-libAfterBase_asvector.c b/wm/afterstep/patches/patch-libAfterBase_asvector.c new file mode 100644 index 00000000000..6a604b0884f --- /dev/null +++ b/wm/afterstep/patches/patch-libAfterBase_asvector.c @@ -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 --git a/wm/afterstep/patches/patch-libAfterBase_asvector.h b/wm/afterstep/patches/patch-libAfterBase_asvector.h new file mode 100644 index 00000000000..53e79d9ffb4 --- /dev/null +++ b/wm/afterstep/patches/patch-libAfterBase_asvector.h @@ -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 --git a/wm/afterstep/patches/patch-libAfterImage_asfont.c b/wm/afterstep/patches/patch-libAfterImage_asfont.c new file mode 100644 index 00000000000..d85121ec156 --- /dev/null +++ b/wm/afterstep/patches/patch-libAfterImage_asfont.c @@ -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 --git a/wm/afterstep/patches/patch-libAfterStep_functions.c b/wm/afterstep/patches/patch-libAfterStep_functions.c new file mode 100644 index 00000000000..dec2bb002b9 --- /dev/null +++ b/wm/afterstep/patches/patch-libAfterStep_functions.c @@ -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 --git a/wm/afterstep/patches/patch-libAfterStep_functions.h b/wm/afterstep/patches/patch-libAfterStep_functions.h new file mode 100644 index 00000000000..b5778aca306 --- /dev/null +++ b/wm/afterstep/patches/patch-libAfterStep_functions.h @@ -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 --git a/wm/afterstep/patches/patch-libAfterStep_mylook.c b/wm/afterstep/patches/patch-libAfterStep_mylook.c new file mode 100644 index 00000000000..7b0bbbfb3d3 --- /dev/null +++ b/wm/afterstep/patches/patch-libAfterStep_mylook.c @@ -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 --git a/wm/afterstep/patches/patch-libAfterStep_mylook.h b/wm/afterstep/patches/patch-libAfterStep_mylook.h new file mode 100644 index 00000000000..ea1de432cdd --- /dev/null +++ b/wm/afterstep/patches/patch-libAfterStep_mylook.h @@ -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 --git a/wm/afterstep/patches/patch-src_afterstep_asinternals.h b/wm/afterstep/patches/patch-src_afterstep_asinternals.h new file mode 100644 index 00000000000..c880734947d --- /dev/null +++ b/wm/afterstep/patches/patch-src_afterstep_asinternals.h @@ -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 --git a/wm/afterstep/patches/patch-src_afterstep_misc.c b/wm/afterstep/patches/patch-src_afterstep_misc.c new file mode 100644 index 00000000000..8189413fca0 --- /dev/null +++ b/wm/afterstep/patches/patch-src_afterstep_misc.c @@ -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); -- cgit v1.2.3