Move variable declarations from header to C file to fix build with GCC 10
GCC 10 builds with -fno-common by default, which causes linker errors when variables are declared in header files and included in multiple places. See also: https://gcc.gnu.org/gcc-10/porting_to.html
This commit is contained in:
parent
245f38ccd5
commit
d256d90550
|
@ -20,6 +20,8 @@
|
||||||
#include "common/lualib.h"
|
#include "common/lualib.h"
|
||||||
#include "luaa.h"
|
#include "luaa.h"
|
||||||
|
|
||||||
|
lua_CFunction lualib_dofunction_on_error;
|
||||||
|
|
||||||
void luaA_checkfunction(lua_State *L, int idx)
|
void luaA_checkfunction(lua_State *L, int idx)
|
||||||
{
|
{
|
||||||
if(!lua_isfunction(L, idx))
|
if(!lua_isfunction(L, idx))
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#include "common/util.h"
|
#include "common/util.h"
|
||||||
|
|
||||||
/** Lua function to call on dofunction() error */
|
/** Lua function to call on dofunction() error */
|
||||||
lua_CFunction lualib_dofunction_on_error;
|
extern lua_CFunction lualib_dofunction_on_error;
|
||||||
|
|
||||||
void luaA_checkfunction(lua_State *, int);
|
void luaA_checkfunction(lua_State *, int);
|
||||||
void luaA_checktable(lua_State *, int);
|
void luaA_checktable(lua_State *, int);
|
||||||
|
|
2
luaa.c
2
luaa.c
|
@ -91,6 +91,8 @@ extern const struct luaL_Reg awesome_mouse_meta[];
|
||||||
extern const struct luaL_Reg awesome_root_methods[];
|
extern const struct luaL_Reg awesome_root_methods[];
|
||||||
extern const struct luaL_Reg awesome_root_meta[];
|
extern const struct luaL_Reg awesome_root_meta[];
|
||||||
|
|
||||||
|
signal_array_t global_signals;
|
||||||
|
|
||||||
/** A call into the Lua code aborted with an error.
|
/** A call into the Lua code aborted with an error.
|
||||||
*
|
*
|
||||||
* This signal is used in the example configuration, @{05-awesomerc.md},
|
* This signal is used in the example configuration, @{05-awesomerc.md},
|
||||||
|
|
2
luaa.h
2
luaa.h
|
@ -317,7 +317,7 @@ const char *luaA_find_config(xdgHandle *, const char *, luaA_config_callback *);
|
||||||
bool luaA_parserc(xdgHandle *, const char *);
|
bool luaA_parserc(xdgHandle *, const char *);
|
||||||
|
|
||||||
/** Global signals */
|
/** Global signals */
|
||||||
signal_array_t global_signals;
|
extern signal_array_t global_signals;
|
||||||
|
|
||||||
int luaA_class_index_miss_property(lua_State *, lua_object_t *);
|
int luaA_class_index_miss_property(lua_State *, lua_object_t *);
|
||||||
int luaA_class_newindex_miss_property(lua_State *, lua_object_t *);
|
int luaA_class_newindex_miss_property(lua_State *, lua_object_t *);
|
||||||
|
|
|
@ -35,6 +35,8 @@
|
||||||
|
|
||||||
#include "button.h"
|
#include "button.h"
|
||||||
|
|
||||||
|
lua_class_t button_class;
|
||||||
|
|
||||||
/** Button object.
|
/** Button object.
|
||||||
*
|
*
|
||||||
* @tfield int button The mouse button number, or 0 for any button.
|
* @tfield int button The mouse button number, or 0 for any button.
|
||||||
|
|
|
@ -39,7 +39,7 @@ typedef struct button_t
|
||||||
xcb_button_t button;
|
xcb_button_t button;
|
||||||
} button_t;
|
} button_t;
|
||||||
|
|
||||||
lua_class_t button_class;
|
extern lua_class_t button_class;
|
||||||
LUA_OBJECT_FUNCS(button_class, button_t, button)
|
LUA_OBJECT_FUNCS(button_class, button_t, button)
|
||||||
ARRAY_FUNCS(button_t *, button, DO_NOTHING)
|
ARRAY_FUNCS(button_t *, button, DO_NOTHING)
|
||||||
|
|
||||||
|
|
|
@ -108,6 +108,8 @@
|
||||||
#include <xcb/shape.h>
|
#include <xcb/shape.h>
|
||||||
#include <cairo-xcb.h>
|
#include <cairo-xcb.h>
|
||||||
|
|
||||||
|
lua_class_t client_class;
|
||||||
|
|
||||||
/** Client class.
|
/** Client class.
|
||||||
*
|
*
|
||||||
* This table allow to add more dynamic properties to the clients. For example,
|
* This table allow to add more dynamic properties to the clients. For example,
|
||||||
|
|
|
@ -200,7 +200,7 @@ struct client_t
|
||||||
ARRAY_FUNCS(client_t *, client, DO_NOTHING)
|
ARRAY_FUNCS(client_t *, client, DO_NOTHING)
|
||||||
|
|
||||||
/** Client class */
|
/** Client class */
|
||||||
lua_class_t client_class;
|
extern lua_class_t client_class;
|
||||||
|
|
||||||
LUA_OBJECT_FUNCS(client_class, client_t, client)
|
LUA_OBJECT_FUNCS(client_class, client_t, client)
|
||||||
|
|
||||||
|
|
|
@ -46,6 +46,8 @@
|
||||||
#include <cairo-xcb.h>
|
#include <cairo-xcb.h>
|
||||||
#include <xcb/shape.h>
|
#include <xcb/shape.h>
|
||||||
|
|
||||||
|
lua_class_t drawin_class;
|
||||||
|
|
||||||
/** Drawin object.
|
/** Drawin object.
|
||||||
*
|
*
|
||||||
* @field border_width Border width.
|
* @field border_width Border width.
|
||||||
|
|
|
@ -52,7 +52,7 @@ void luaA_drawin_systray_kickout(lua_State *);
|
||||||
|
|
||||||
void drawin_class_setup(lua_State *);
|
void drawin_class_setup(lua_State *);
|
||||||
|
|
||||||
lua_class_t drawin_class;
|
extern lua_class_t drawin_class;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
|
// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
|
||||||
|
|
|
@ -43,6 +43,8 @@
|
||||||
#include <xkbcommon/xkbcommon.h>
|
#include <xkbcommon/xkbcommon.h>
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
|
||||||
|
lua_class_t key_class;
|
||||||
|
|
||||||
/** Key object.
|
/** Key object.
|
||||||
*
|
*
|
||||||
* @tfield string key The key to trigger an event.
|
* @tfield string key The key to trigger an event.
|
||||||
|
|
|
@ -36,7 +36,7 @@ typedef struct keyb_t
|
||||||
xcb_keycode_t keycode;
|
xcb_keycode_t keycode;
|
||||||
} keyb_t;
|
} keyb_t;
|
||||||
|
|
||||||
lua_class_t key_class;
|
extern lua_class_t key_class;
|
||||||
LUA_OBJECT_FUNCS(key_class, keyb_t, key)
|
LUA_OBJECT_FUNCS(key_class, keyb_t, key)
|
||||||
DO_ARRAY(keyb_t *, key, DO_NOTHING)
|
DO_ARRAY(keyb_t *, key, DO_NOTHING)
|
||||||
|
|
||||||
|
|
|
@ -203,6 +203,8 @@
|
||||||
#include "ewmh.h"
|
#include "ewmh.h"
|
||||||
#include "luaa.h"
|
#include "luaa.h"
|
||||||
|
|
||||||
|
lua_class_t tag_class;
|
||||||
|
|
||||||
/** When a tag requests to be selected.
|
/** When a tag requests to be selected.
|
||||||
* @signal request::select
|
* @signal request::select
|
||||||
* @tparam string context The reason why it was called.
|
* @tparam string context The reason why it was called.
|
||||||
|
|
|
@ -46,7 +46,7 @@ struct tag
|
||||||
client_array_t clients;
|
client_array_t clients;
|
||||||
};
|
};
|
||||||
|
|
||||||
lua_class_t tag_class;
|
extern lua_class_t tag_class;
|
||||||
LUA_OBJECT_FUNCS(tag_class, tag_t, tag)
|
LUA_OBJECT_FUNCS(tag_class, tag_t, tag)
|
||||||
|
|
||||||
void tag_class_setup(lua_State *);
|
void tag_class_setup(lua_State *);
|
||||||
|
|
|
@ -59,6 +59,7 @@
|
||||||
#include "property.h"
|
#include "property.h"
|
||||||
#include "xwindow.h"
|
#include "xwindow.h"
|
||||||
|
|
||||||
|
lua_class_t window_class;
|
||||||
LUA_CLASS_FUNCS(window, window_class)
|
LUA_CLASS_FUNCS(window, window_class)
|
||||||
|
|
||||||
static xcb_window_t
|
static xcb_window_t
|
||||||
|
|
|
@ -80,7 +80,7 @@ typedef struct
|
||||||
WINDOW_OBJECT_HEADER
|
WINDOW_OBJECT_HEADER
|
||||||
} window_t;
|
} window_t;
|
||||||
|
|
||||||
lua_class_t window_class;
|
extern lua_class_t window_class;
|
||||||
|
|
||||||
void window_class_setup(lua_State *);
|
void window_class_setup(lua_State *);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue