From 5a78bf1bffef2659abb74ff0778a2c31fafb83ab Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sat, 7 Apr 2007 02:14:22 +0000 Subject: [PATCH] use VISIBLE instead of __attribute__ ((visibility ("default"))) directly --- libs/console/complete.c | 3 +-- libs/console/console.c | 44 +++++++++++++++------------------------- libs/console/filelist.c | 15 +++++--------- libs/console/inputline.c | 12 ++++------- libs/console/list.c | 2 +- libs/console/view.c | 24 ++++++++-------------- 6 files changed, 35 insertions(+), 65 deletions(-) diff --git a/libs/console/complete.c b/libs/console/complete.c index 709eaff5a..70d44166b 100644 --- a/libs/console/complete.c +++ b/libs/console/complete.c @@ -56,8 +56,7 @@ static __attribute__ ((used)) const char rcsid[] = Thanks to Fett erich@heintz.com Thanks to taniwha */ -__attribute__((visibility ("default"))) -void +VISIBLE void Con_BasicCompleteCommandLine (inputline_t *il) { char *s; diff --git a/libs/console/console.c b/libs/console/console.c index fbd10d732..52fb8b52f 100644 --- a/libs/console/console.c +++ b/libs/console/console.c @@ -44,9 +44,9 @@ static __attribute__ ((used)) const char rcsid[] = #include "QF/sys.h" //FIXME probably shouldn't be visible -int con_linewidth __attribute__ ((visibility ("default"))); // characters across screen +VISIBLE int con_linewidth; // characters across screen -plugin_t *con_module __attribute__ ((visibility ("default"))); +VISIBLE plugin_t *con_module; #define U __attribute__ ((used)) static U con_buffer_t *(*const buffer) (size_t, int) = Con_CreateBuffer; @@ -57,8 +57,7 @@ static U void (*const display)(const char **, int) = Con_DisplayList; static cvar_t *con_interpreter; -__attribute__ ((visibility ("default"))) -void +VISIBLE void Con_Init (const char *plugin_name) { con_module = PI_LoadPlugin ("console", plugin_name); @@ -71,9 +70,9 @@ Con_Init (const char *plugin_name) } static void -Con_Interp_f (cvar_t* var) +Con_Interp_f (cvar_t *var) { - cbuf_interpreter_t* interp = Cmd_GetProvider(var->string); + cbuf_interpreter_t *interp = Cmd_GetProvider(var->string); if (con_module && interp) { cbuf_t *new; @@ -93,8 +92,7 @@ Con_Interp_f (cvar_t* var) } } -__attribute__ ((visibility ("default"))) -void +VISIBLE void Con_Init_Cvars (void) { con_interpreter = @@ -102,8 +100,7 @@ Con_Init_Cvars (void) "Interpreter for the interactive console"); } -__attribute__ ((visibility ("default"))) -void +VISIBLE void Con_Shutdown (void) { if (con_module) { @@ -112,8 +109,7 @@ Con_Shutdown (void) } } -__attribute__ ((visibility ("default"))) -void +VISIBLE void Con_Printf (const char *fmt, ...) { va_list args; @@ -126,8 +122,7 @@ Con_Printf (const char *fmt, ...) va_end (args); } -__attribute__ ((visibility ("default"))) -void +VISIBLE void Con_Print (const char *fmt, va_list args) { if (con_module) @@ -136,8 +131,7 @@ Con_Print (const char *fmt, va_list args) vfprintf (stdout, fmt, args); } -__attribute__ ((visibility ("default"))) -void +VISIBLE void Con_DPrintf (const char *fmt, ...) { if (developer && developer->int_val) { @@ -151,8 +145,7 @@ Con_DPrintf (const char *fmt, ...) } } -__attribute__ ((visibility ("default"))) -void +VISIBLE void Con_ProcessInput (void) { if (con_module) { @@ -167,40 +160,35 @@ Con_ProcessInput (void) } } -__attribute__ ((visibility ("default"))) -void +VISIBLE void Con_KeyEvent (knum_t key, short unicode, qboolean down) { if (con_module) con_module->functions->console->pC_KeyEvent (key, unicode, down); } -__attribute__ ((visibility ("default"))) -void +VISIBLE void Con_SetOrMask (int mask) { if (con_module) con_module->data->console->ormask = mask; } -__attribute__ ((visibility ("default"))) -void +VISIBLE void Con_DrawConsole (void) { if (con_module) con_module->functions->console->pC_DrawConsole (); } -__attribute__ ((visibility ("default"))) -void +VISIBLE void Con_CheckResize (void) { if (con_module) con_module->functions->console->pC_CheckResize (); } -__attribute__ ((visibility ("default"))) -void +VISIBLE void Con_NewMap (void) { if (con_module) diff --git a/libs/console/filelist.c b/libs/console/filelist.c index aebfd6b67..46f6f70ef 100644 --- a/libs/console/filelist.c +++ b/libs/console/filelist.c @@ -115,8 +115,7 @@ filelist_print (filelist_t *filelist) } } -__attribute__ ((visibility ("default"))) -void +VISIBLE void Con_Maplist_f (void) { filelist_t *maplist = QFS_FilelistNew (); @@ -127,8 +126,7 @@ Con_Maplist_f (void) QFS_FilelistFree (maplist); } -__attribute__ ((visibility ("default"))) -void +VISIBLE void Con_Skinlist_f (void) { filelist_t *skinlist = QFS_FilelistNew (); @@ -149,8 +147,7 @@ const char *sb_endings[] = { 0 }; -__attribute__ ((visibility ("default"))) -void +VISIBLE void Con_Skyboxlist_f (void) { int i, j, k, c, b; @@ -187,8 +184,7 @@ Con_Skyboxlist_f (void) QFS_FilelistFree (skyboxlist); } -__attribute__ ((visibility ("default"))) -void +VISIBLE void Con_Demolist_QWD_f (void) { filelist_t *demolist = QFS_FilelistNew (); @@ -201,8 +197,7 @@ Con_Demolist_QWD_f (void) return; } -__attribute__ ((visibility ("default"))) -void +VISIBLE void Con_Demolist_DEM_f (void) { filelist_t *demolist = QFS_FilelistNew (); diff --git a/libs/console/inputline.c b/libs/console/inputline.c index 0f4308aba..da96955fb 100644 --- a/libs/console/inputline.c +++ b/libs/console/inputline.c @@ -48,8 +48,7 @@ static __attribute__ ((used)) const char rcsid[] = #include "compat.h" -__attribute__ ((visibility ("default"))) -struct inputline_s * +VISIBLE struct inputline_s * Con_CreateInputLine (int lines, int lsize, char prompt) { char *l, **p; @@ -80,15 +79,13 @@ Con_CreateInputLine (int lines, int lsize, char prompt) return inputline; } -__attribute__ ((visibility ("default"))) -void +VISIBLE void Con_DestroyInputLine (inputline_t *inputline) { free (inputline); } -__attribute__ ((visibility ("default"))) -void +VISIBLE void Con_ClearTyping (inputline_t *il, int save) { if (save && il->lines[il->edit_line][1]) { @@ -100,8 +97,7 @@ Con_ClearTyping (inputline_t *il, int save) il->linepos = 1; } -__attribute__ ((visibility ("default"))) -void +VISIBLE void Con_ProcessInputLine (inputline_t *il, int ch) { size_t i; diff --git a/libs/console/list.c b/libs/console/list.c index 474406c1d..2b0ecd6e6 100644 --- a/libs/console/list.c +++ b/libs/console/list.c @@ -40,7 +40,7 @@ static __attribute__ ((used)) const char rcsid[] = #include "QF/console.h" -void (*con_list_print)(const char *fmt, ...) __attribute__ ((visibility ("default"))) = Con_Printf; +VISIBLE void (*con_list_print)(const char *fmt, ...) = Con_Printf; /* Con_DisplayList diff --git a/libs/console/view.c b/libs/console/view.c index d5a8395b3..ec2855945 100644 --- a/libs/console/view.c +++ b/libs/console/view.c @@ -44,8 +44,7 @@ static __attribute__ ((used)) const char rcsid[] = #include "QF/view.h" -__attribute__ ((visibility ("default"))) -view_t * +VISIBLE view_t * view_new (int xp, int yp, int xl, int yl, grav_t grav) { view_t *view = calloc (1, sizeof (view_t)); @@ -121,8 +120,7 @@ setgeometry (view_t *view) setgeometry (view->children[i]); } -__attribute__ ((visibility ("default"))) -void +VISIBLE void view_insert (view_t *par, view_t *view, int pos) { view->parent = par; @@ -146,15 +144,13 @@ view_insert (view_t *par, view_t *view, int pos) setgeometry (view); } -__attribute__ ((visibility ("default"))) -void +VISIBLE void view_add (view_t *par, view_t *view) { view_insert (par, view, -1); } -__attribute__ ((visibility ("default"))) -void +VISIBLE void view_remove (view_t *par, view_t *view) { int i; @@ -169,8 +165,7 @@ view_remove (view_t *par, view_t *view) } } -__attribute__ ((visibility ("default"))) -void +VISIBLE void view_delete (view_t *view) { if (view->parent) @@ -180,8 +175,7 @@ view_delete (view_t *view) free (view); } -__attribute__ ((visibility ("default"))) -void +VISIBLE void view_draw (view_t *view) { int i; @@ -215,16 +209,14 @@ _resize (view_t *view, int xl, int yl) } } -__attribute__ ((visibility ("default"))) -void +VISIBLE void view_resize (view_t *view, int xl, int yl) { _resize (view, xl, yl); setgeometry (view); } -__attribute__ ((visibility ("default"))) -void +VISIBLE void view_move (view_t *view, int xp, int yp) { view->xpos = xp;