. Don't use inline on functions that are intended to be used in multiple

  files.  This fixes compilation with clang.

  My understanding is that the C99 standard treats inline methods as having
  static linkage by default.  This is different from the GNU C definition
  of inline, which is why this compiled with gcc.

10 files changed, 170 insertions, 0 deletions

diff --git a/x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.c b/x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.c
new file mode 100644
index 000000000000..0c7043bed9ba
--- /dev/null
+++ b/x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.c
@@ -0,0 +1,22 @@
+$FreeBSD$
+
+--- libAfterBase/asvector.c.orig	2013-05-01 06:34:11.000000000 -0700
++++ libAfterBase/asvector.c	2014-04-12 12:22:48.000000000 -0700
+@@ -126,7 +126,7 @@
+ 
+ /* 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 @@
+     return i;
+ }
+ 
+-inline void vector_move_data_up( ASVector *v, int index, int offset, int length )
++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/x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.h b/x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.h
new file mode 100644
index 000000000000..7e9356386c56
--- /dev/null
+++ b/x11-wm/afterstep-stable/files/patch-libAfterBase-asvector.h
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- libAfterBase/asvector.h.orig	2014-04-12 12:22:00.000000000 -0700
++++ libAfterBase/asvector.h	2014-04-12 12:22:37.000000000 -0700
+@@ -38,7 +38,7 @@
+ /* 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, unsigned int index, 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/x11-wm/afterstep-stable/files/patch-libAfterBase-parse.c b/x11-wm/afterstep-stable/files/patch-libAfterBase-parse.c
new file mode 100644
index 000000000000..8f76b015129f
--- /dev/null
+++ b/x11-wm/afterstep-stable/files/patch-libAfterBase-parse.c
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- libAfterBase/parse.c.orig	2014-04-12 10:22:32.000000000 -0700
++++ libAfterBase/parse.c	2014-04-11 06:31:13.000000000 -0700
+@@ -1027,7 +1027,7 @@
+ 
+ static char _as_hex_to_char_table[] = "0123456789ABCDEF";
+ 
+-inline int
++int
+ unsigned_int2buffer_end (char *buffer, int buffer_size, unsigned int val)
+ {
+ 	int i = buffer_size-1 ; 
diff --git a/x11-wm/afterstep-stable/files/patch-libAfterBase-parse.h b/x11-wm/afterstep-stable/files/patch-libAfterBase-parse.h
new file mode 100644
index 000000000000..f53eb543f990
--- /dev/null
+++ b/x11-wm/afterstep-stable/files/patch-libAfterBase-parse.h
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- libAfterBase/parse.h.orig	2014-04-12 10:22:23.000000000 -0700
++++ libAfterBase/parse.h	2014-04-11 06:31:10.000000000 -0700
+@@ -73,7 +73,7 @@
+ 
+ double parse_math(const char* str, char** endptr, double size);
+ 
+-inline int unsigned_int2buffer_end (char *buffer, int buffer_size, unsigned int val);
++int unsigned_int2buffer_end (char *buffer, int buffer_size, unsigned int val);
+ char *string_from_int (int param);
+ char *hex_to_buffer_reverse(void *data, size_t bytes, char* buffer);
+ char *hex_to_buffer(void *data, size_t bytes, char* buffer);
diff --git a/x11-wm/afterstep-stable/files/patch-libAfterStep-functions.c b/x11-wm/afterstep-stable/files/patch-libAfterStep-functions.c
new file mode 100644
index 000000000000..ddd1d223c8a7
--- /dev/null
+++ b/x11-wm/afterstep-stable/files/patch-libAfterStep-functions.c
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- libAfterStep/functions.c.orig	2014-04-12 10:22:40.000000000 -0700
++++ libAfterStep/functions.c	2014-04-11 06:32:05.000000000 -0700
+@@ -307,7 +307,7 @@
+ 	}
+ }
+ 
+-inline FunctionData *create_named_function (int func, char *name)
++FunctionData *create_named_function (int func, char *name)
+ {
+ 	FunctionData *fdata = safecalloc (1, sizeof (FunctionData));
+ 
diff --git a/x11-wm/afterstep-stable/files/patch-libAfterStep-functions.h b/x11-wm/afterstep-stable/files/patch-libAfterStep-functions.h
new file mode 100644
index 000000000000..53b0fa776209
--- /dev/null
+++ b/x11-wm/afterstep-stable/files/patch-libAfterStep-functions.h
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- libAfterStep/functions.h.orig	2014-04-12 10:22:47.000000000 -0700
++++ libAfterStep/functions.h	2014-04-11 06:32:13.000000000 -0700
+@@ -314,7 +314,7 @@
+ 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/x11-wm/afterstep-stable/files/patch-libAfterStep-mylook.c b/x11-wm/afterstep-stable/files/patch-libAfterStep-mylook.c
new file mode 100644
index 000000000000..a16e6671a20d
--- /dev/null
+++ b/x11-wm/afterstep-stable/files/patch-libAfterStep-mylook.c
@@ -0,0 +1,31 @@
+$FreeBSD$
+
+--- libAfterStep/mylook.c.orig	2014-04-12 12:25:04.000000000 -0700
++++ libAfterStep/mylook.c	2014-04-12 12:26:22.000000000 -0700
+@@ -843,7 +843,7 @@
+ 	return NULL;
+ }
+ 
+-inline MyDesktopConfig *mylook_get_desk_config (MyLook * look, long desk)
++MyDesktopConfig *mylook_get_desk_config (MyLook * look, long desk)
+ {
+ 	if (look) {
+ 		ASHashData hdata = { 0 };
+@@ -856,7 +856,7 @@
+ }
+ 
+ 
+-inline MyBackground *mylook_get_desk_back (MyLook * look, long desk)
++MyBackground *mylook_get_desk_back (MyLook * look, long desk)
+ {
+ 	MyBackground *myback = NULL;
+ 
+@@ -888,7 +888,7 @@
+ }
+ 
+ 
+-inline MyBackground *mylook_get_back (MyLook * look, char *name)
++MyBackground *mylook_get_back (MyLook * look, char *name)
+ {
+ 	ASHashData hdata = { 0 };
+ 	if (look && name)
diff --git a/x11-wm/afterstep-stable/files/patch-libAfterStep-mylook.h b/x11-wm/afterstep-stable/files/patch-libAfterStep-mylook.h
new file mode 100644
index 000000000000..4cb68b833581
--- /dev/null
+++ b/x11-wm/afterstep-stable/files/patch-libAfterStep-mylook.h
@@ -0,0 +1,17 @@
+$FreeBSD$
+
+--- libAfterStep/mylook.h.orig	2014-04-12 12:24:55.000000000 -0700
++++ libAfterStep/mylook.h	2014-04-12 12:25:46.000000000 -0700
+@@ -411,9 +411,9 @@
+ 
+ 
+ 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/x11-wm/afterstep-stable/files/patch-src-afterstep-asinternals.h b/x11-wm/afterstep-stable/files/patch-src-afterstep-asinternals.h
new file mode 100644
index 000000000000..aab0a1917543
--- /dev/null
+++ b/x11-wm/afterstep-stable/files/patch-src-afterstep-asinternals.h
@@ -0,0 +1,15 @@
+$FreeBSD$
+
+--- src/afterstep/asinternals.h.orig	2014-04-12 12:29:08.000000000 -0700
++++ src/afterstep/asinternals.h	2014-04-12 12:28:35.000000000 -0700
+@@ -689,8 +689,8 @@
+ 
+ 
+ /*************************** 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/x11-wm/afterstep-stable/files/patch-src-afterstep-misc.c b/x11-wm/afterstep-stable/files/patch-src-afterstep-misc.c
new file mode 100644
index 000000000000..c10e482ed976
--- /dev/null
+++ b/x11-wm/afterstep-stable/files/patch-src-afterstep-misc.c
@@ -0,0 +1,20 @@
+$FreeBSD$
+
+--- src/afterstep/misc.c.orig	2014-04-12 12:28:58.000000000 -0700
++++ src/afterstep/misc.c	2014-04-12 12:29:10.000000000 -0700
+@@ -32,13 +32,13 @@
+ /****************************************************************************/
+ /* window management specifics - button ungrabbing convinience functions:   */
+ /****************************************************************************/
+-inline void ungrab_window_buttons (Window w)
++void ungrab_window_buttons (Window w)
+ {
+ 	LOCAL_DEBUG_OUT ("w = %lX", w);
+ 	XUngrabButton (dpy, AnyButton, AnyModifier, w);
+ }
+ 
+-inline void ungrab_window_keys (Window w)
++void ungrab_window_keys (Window w)
+ {
+ 	XUngrabKey (dpy, AnyKey, AnyModifier, w);
+ }