From e9776f98c67eb1ae8e0aa6d1c4fcd1a19f76a648 Mon Sep 17 00:00:00 2001 From: bjorn Date: Thu, 24 Nov 2022 14:33:55 -0800 Subject: [PATCH] Fix compatibility with Lua 5.2, 5.3, 5.4; Part of this involved putting the Lua header back in api.h, since we need to know the Lua version to define some macros properly. --- src/api/api.c | 2 +- src/api/api.h | 103 +++++++++++++++---------------- src/api/l_audio.c | 2 - src/api/l_audio_source.c | 2 - src/api/l_data.c | 2 - src/api/l_data_blob.c | 2 - src/api/l_data_image.c | 2 - src/api/l_data_modelData.c | 2 - src/api/l_data_rasterizer.c | 2 - src/api/l_data_sound.c | 2 - src/api/l_event.c | 4 +- src/api/l_filesystem.c | 2 - src/api/l_graphics.c | 2 - src/api/l_graphics_buffer.c | 2 - src/api/l_graphics_font.c | 2 - src/api/l_graphics_material.c | 2 - src/api/l_graphics_model.c | 2 - src/api/l_graphics_pass.c | 2 - src/api/l_graphics_readback.c | 2 - src/api/l_graphics_sampler.c | 2 - src/api/l_graphics_shader.c | 2 - src/api/l_graphics_tally.c | 2 - src/api/l_graphics_texture.c | 2 - src/api/l_headset.c | 2 - src/api/l_lovr.c | 2 - src/api/l_math.c | 2 - src/api/l_math_curve.c | 2 - src/api/l_math_randomGenerator.c | 2 - src/api/l_math_vectors.c | 2 - src/api/l_physics.c | 2 - src/api/l_physics_collider.c | 2 - src/api/l_physics_joints.c | 2 - src/api/l_physics_shapes.c | 2 - src/api/l_physics_world.c | 2 - src/api/l_system.c | 2 - src/api/l_thread.c | 2 - src/api/l_thread_channel.c | 2 - src/api/l_thread_thread.c | 2 - src/api/l_timer.c | 2 - 39 files changed, 53 insertions(+), 128 deletions(-) diff --git a/src/api/api.c b/src/api/api.c index 180adf1b..815d2684 100644 --- a/src/api/api.c +++ b/src/api/api.c @@ -396,7 +396,7 @@ uint32_t _luax_checku32(lua_State* L, int index) { double x = lua_tonumber(L, index); if (x == 0. && !lua_isnumber(L, index)) { - luaL_typerror(L, index, "number"); + luax_typeerror(L, index, "number"); } if (x < 0. || x > UINT32_MAX) { diff --git a/src/api/api.h b/src/api/api.h index 95bb3f03..6ba7f505 100644 --- a/src/api/api.h +++ b/src/api/api.h @@ -2,12 +2,11 @@ #include #include #include +#include +#include #pragma once -struct lua_State; -struct luaL_Reg; - // Enums typedef struct { uint8_t length; @@ -107,43 +106,43 @@ typedef struct { #define luax_optfloat(L, i, x) (float) luaL_optnumber(L, i, x) #define luax_tofloat(L, i) (float) lua_tonumber(L, i) -void luax_preload(struct lua_State* L); -void _luax_registertype(struct lua_State* L, const char* name, const struct luaL_Reg* functions, void (*destructor)(void*)); -void* _luax_totype(struct lua_State* L, int index, uint64_t hash); -void* _luax_checktype(struct lua_State* L, int index, uint64_t hash, const char* debug); -int luax_typeerror(struct lua_State* L, int index, const char* expected); -void _luax_pushtype(struct lua_State* L, const char* name, uint64_t hash, void* object); -int _luax_checkenum(struct lua_State* L, int index, const StringEntry* map, const char* fallback, const char* label); -void luax_registerloader(struct lua_State* L, int (*loader)(struct lua_State* L), int index); -int luax_resume(struct lua_State* T, int n); +void luax_preload(lua_State* L); +void _luax_registertype(lua_State* L, const char* name, const luaL_Reg* functions, void (*destructor)(void*)); +void* _luax_totype(lua_State* L, int index, uint64_t hash); +void* _luax_checktype(lua_State* L, int index, uint64_t hash, const char* debug); +int luax_typeerror(lua_State* L, int index, const char* expected); +void _luax_pushtype(lua_State* L, const char* name, uint64_t hash, void* object); +int _luax_checkenum(lua_State* L, int index, const StringEntry* map, const char* fallback, const char* label); +void luax_registerloader(lua_State* L, int (*loader)(lua_State* L), int index); +int luax_resume(lua_State* T, int n); void luax_vthrow(void* L, const char* format, va_list args); void luax_vlog(void* context, int level, const char* tag, const char* format, va_list args); -void luax_traceback(struct lua_State* L, struct lua_State* T, const char* message, int level); -int luax_getstack(struct lua_State* L); -void luax_pushconf(struct lua_State* L); -int luax_setconf(struct lua_State* L); -void luax_setmainthread(struct lua_State* L); -void luax_atexit(struct lua_State* L, void (*finalizer)(void)); -uint32_t _luax_checku32(struct lua_State* L, int index); -uint32_t _luax_optu32(struct lua_State* L, int index, uint32_t fallback); -void luax_readcolor(struct lua_State* L, int index, float color[4]); -void luax_optcolor(struct lua_State* L, int index, float color[4]); -int luax_readmesh(struct lua_State* L, int index, float** vertices, uint32_t* vertexCount, uint32_t** indices, uint32_t* indexCount, bool* shouldFree); +void luax_traceback(lua_State* L, lua_State* T, const char* message, int level); +int luax_getstack(lua_State* L); +void luax_pushconf(lua_State* L); +int luax_setconf(lua_State* L); +void luax_setmainthread(lua_State* L); +void luax_atexit(lua_State* L, void (*finalizer)(void)); +uint32_t _luax_checku32(lua_State* L, int index); +uint32_t _luax_optu32(lua_State* L, int index, uint32_t fallback); +void luax_readcolor(lua_State* L, int index, float color[4]); +void luax_optcolor(lua_State* L, int index, float color[4]); +int luax_readmesh(lua_State* L, int index, float** vertices, uint32_t* vertexCount, uint32_t** indices, uint32_t* indexCount, bool* shouldFree); // Module helpers #ifndef LOVR_DISABLE_DATA struct Blob; struct Image; -struct Blob* luax_readblob(struct lua_State* L, int index, const char* debug); -struct Image* luax_checkimage(struct lua_State* L, int index); -uint32_t luax_checkcodepoint(struct lua_State* L, int index); +struct Blob* luax_readblob(lua_State* L, int index, const char* debug); +struct Image* luax_checkimage(lua_State* L, int index); +uint32_t luax_checkcodepoint(lua_State* L, int index); #endif #ifndef LOVR_DISABLE_EVENT struct Variant; -void luax_checkvariant(struct lua_State* L, int index, struct Variant* variant); -int luax_pushvariant(struct lua_State* L, struct Variant* variant); +void luax_checkvariant(lua_State* L, int index, struct Variant* variant); +int luax_pushvariant(lua_State* L, struct Variant* variant); #endif #ifndef LOVR_DISABLE_FILESYSTEM @@ -155,37 +154,37 @@ bool luax_writefile(const char* filename, const void* data, size_t size); struct Buffer; struct ColoredString; struct Model; -struct Buffer* luax_checkbuffer(struct lua_State* L, int index); -void luax_readbufferfield(struct lua_State* L, int index, int type, void* data); -void luax_readbufferdata(struct lua_State* L, int index, struct Buffer* buffer, char* data); -uint32_t luax_checkcomparemode(struct lua_State* L, int index); -struct ColoredString* luax_checkcoloredstrings(struct lua_State* L, int index, uint32_t* count, struct ColoredString* stack); -uint32_t luax_checknodeindex(struct lua_State* L, int index, struct Model* model); +struct Buffer* luax_checkbuffer(lua_State* L, int index); +void luax_readbufferfield(lua_State* L, int index, int type, void* data); +void luax_readbufferdata(lua_State* L, int index, struct Buffer* buffer, char* data); +uint32_t luax_checkcomparemode(lua_State* L, int index); +struct ColoredString* luax_checkcoloredstrings(lua_State* L, int index, uint32_t* count, struct ColoredString* stack); +uint32_t luax_checknodeindex(lua_State* L, int index, struct Model* model); #endif #ifndef LOVR_DISABLE_MATH #include "math/pool.h" // TODO -float* luax_tovector(struct lua_State* L, int index, VectorType* type); -float* luax_checkvector(struct lua_State* L, int index, VectorType type, const char* expected); -float* luax_newtempvector(struct lua_State* L, VectorType type); -int luax_readvec3(struct lua_State* L, int index, float* v, const char* expected); -int luax_readscale(struct lua_State* L, int index, float* v, int components, const char* expected); -int luax_readquat(struct lua_State* L, int index, float* q, const char* expected); -int luax_readmat4(struct lua_State* L, int index, float* m, int scaleComponents); -uint64_t luax_checkrandomseed(struct lua_State* L, int index); +float* luax_tovector(lua_State* L, int index, VectorType* type); +float* luax_checkvector(lua_State* L, int index, VectorType type, const char* expected); +float* luax_newtempvector(lua_State* L, VectorType type); +int luax_readvec3(lua_State* L, int index, float* v, const char* expected); +int luax_readscale(lua_State* L, int index, float* v, int components, const char* expected); +int luax_readquat(lua_State* L, int index, float* q, const char* expected); +int luax_readmat4(lua_State* L, int index, float* m, int scaleComponents); +uint64_t luax_checkrandomseed(lua_State* L, int index); #endif #ifndef LOVR_DISABLE_PHYSICS struct Joint; struct Shape; -void luax_pushjoint(struct lua_State* L, struct Joint* joint); -void luax_pushshape(struct lua_State* L, struct Shape* shape); -struct Joint* luax_checkjoint(struct lua_State* L, int index); -struct Shape* luax_checkshape(struct lua_State* L, int index); -struct Shape* luax_newsphereshape(struct lua_State* L, int index); -struct Shape* luax_newboxshape(struct lua_State* L, int index); -struct Shape* luax_newcapsuleshape(struct lua_State* L, int index); -struct Shape* luax_newcylindershape(struct lua_State* L, int index); -struct Shape* luax_newmeshshape(struct lua_State* L, int index); -struct Shape* luax_newterrainshape(struct lua_State* L, int index); +void luax_pushjoint(lua_State* L, struct Joint* joint); +void luax_pushshape(lua_State* L, struct Shape* shape); +struct Joint* luax_checkjoint(lua_State* L, int index); +struct Shape* luax_checkshape(lua_State* L, int index); +struct Shape* luax_newsphereshape(lua_State* L, int index); +struct Shape* luax_newboxshape(lua_State* L, int index); +struct Shape* luax_newcapsuleshape(lua_State* L, int index); +struct Shape* luax_newcylindershape(lua_State* L, int index); +struct Shape* luax_newmeshshape(lua_State* L, int index); +struct Shape* luax_newterrainshape(lua_State* L, int index); #endif diff --git a/src/api/l_audio.c b/src/api/l_audio.c index fc5afe08..3beac8a2 100644 --- a/src/api/l_audio.c +++ b/src/api/l_audio.c @@ -4,8 +4,6 @@ #include "data/sound.h" #include "core/maf.h" #include "util.h" -#include -#include #include StringEntry lovrEffect[] = { diff --git a/src/api/l_audio_source.c b/src/api/l_audio_source.c index 6a21df85..e5461650 100644 --- a/src/api/l_audio_source.c +++ b/src/api/l_audio_source.c @@ -2,8 +2,6 @@ #include "audio/audio.h" #include "core/maf.h" #include "util.h" -#include -#include static int l_lovrSourceClone(lua_State* L) { Source* source = luax_checktype(L, 1, Source); diff --git a/src/api/l_data.c b/src/api/l_data.c index e500b9ad..491a9727 100644 --- a/src/api/l_data.c +++ b/src/api/l_data.c @@ -5,8 +5,6 @@ #include "data/sound.h" #include "data/image.h" #include "util.h" -#include -#include #include #include diff --git a/src/api/l_data_blob.c b/src/api/l_data_blob.c index 3de6304c..13c6e395 100644 --- a/src/api/l_data_blob.c +++ b/src/api/l_data_blob.c @@ -1,8 +1,6 @@ #include "api.h" #include "data/blob.h" #include "util.h" -#include -#include static int l_lovrBlobGetName(lua_State* L) { Blob* blob = luax_checktype(L, 1, Blob); diff --git a/src/api/l_data_image.c b/src/api/l_data_image.c index 07657498..c4d22bcb 100644 --- a/src/api/l_data_image.c +++ b/src/api/l_data_image.c @@ -2,8 +2,6 @@ #include "data/image.h" #include "data/blob.h" #include "util.h" -#include -#include StringEntry lovrTextureFormat[] = { [FORMAT_R8] = ENTRY("r8"), diff --git a/src/api/l_data_modelData.c b/src/api/l_data_modelData.c index 507269af..9f2553f7 100644 --- a/src/api/l_data_modelData.c +++ b/src/api/l_data_modelData.c @@ -2,8 +2,6 @@ #include "data/modelData.h" #include "core/maf.h" #include "util.h" -#include -#include static ModelNode* luax_checknode(lua_State* L, int index, ModelData* model) { switch (lua_type(L, index)) { diff --git a/src/api/l_data_rasterizer.c b/src/api/l_data_rasterizer.c index e5f71280..7a129f58 100644 --- a/src/api/l_data_rasterizer.c +++ b/src/api/l_data_rasterizer.c @@ -2,8 +2,6 @@ #include "data/rasterizer.h" #include "data/image.h" #include "util.h" -#include -#include #include uint32_t luax_checkcodepoint(lua_State* L, int index) { diff --git a/src/api/l_data_sound.c b/src/api/l_data_sound.c index b447ea56..821bc3ff 100644 --- a/src/api/l_data_sound.c +++ b/src/api/l_data_sound.c @@ -2,8 +2,6 @@ #include "data/sound.h" #include "data/blob.h" #include "util.h" -#include -#include StringEntry lovrSampleFormat[] = { [SAMPLE_F32] = ENTRY("f32"), diff --git a/src/api/l_event.c b/src/api/l_event.c index 80145e68..58175e2d 100644 --- a/src/api/l_event.c +++ b/src/api/l_event.c @@ -2,8 +2,6 @@ #include "event/event.h" #include "thread/thread.h" #include "util.h" -#include -#include #include #include @@ -185,7 +183,7 @@ static int l_lovrEventPush(lua_State* L) { } static int l_lovrEventQuit(lua_State* L) { - int exitCode = luaL_optint(L, 1, 0); + int exitCode = luaL_optinteger(L, 1, 0); Event event = { .type = EVENT_QUIT, .data.quit.exitCode = exitCode }; lovrEventPush(event); return 0; diff --git a/src/api/l_filesystem.c b/src/api/l_filesystem.c index 0e9c3dbe..8d46a8ea 100644 --- a/src/api/l_filesystem.c +++ b/src/api/l_filesystem.c @@ -2,8 +2,6 @@ #include "filesystem/filesystem.h" #include "data/blob.h" #include "util.h" -#include -#include #include #include diff --git a/src/api/l_graphics.c b/src/api/l_graphics.c index c1f03d49..1a854d89 100644 --- a/src/api/l_graphics.c +++ b/src/api/l_graphics.c @@ -5,8 +5,6 @@ #include "data/modelData.h" #include "data/rasterizer.h" #include "util.h" -#include -#include #include #include diff --git a/src/api/l_graphics_buffer.c b/src/api/l_graphics_buffer.c index 02d09466..2d24eeff 100644 --- a/src/api/l_graphics_buffer.c +++ b/src/api/l_graphics_buffer.c @@ -2,8 +2,6 @@ #include "graphics/graphics.h" #include "data/blob.h" #include "util.h" -#include -#include #include #include diff --git a/src/api/l_graphics_font.c b/src/api/l_graphics_font.c index 119eedfa..fa527006 100644 --- a/src/api/l_graphics_font.c +++ b/src/api/l_graphics_font.c @@ -2,8 +2,6 @@ #include "graphics/graphics.h" #include "data/rasterizer.h" #include "util.h" -#include -#include #include ColoredString* luax_checkcoloredstrings(lua_State* L, int index, uint32_t* count, ColoredString* stack) { diff --git a/src/api/l_graphics_material.c b/src/api/l_graphics_material.c index dafd9ed0..d97990f0 100644 --- a/src/api/l_graphics_material.c +++ b/src/api/l_graphics_material.c @@ -1,8 +1,6 @@ #include "api.h" #include "graphics/graphics.h" #include "util.h" -#include -#include static int l_lovrMaterialGetProperties(lua_State* L) { Material* material = luax_checktype(L, 1, Material); diff --git a/src/api/l_graphics_model.c b/src/api/l_graphics_model.c index b00a97c0..545e097f 100644 --- a/src/api/l_graphics_model.c +++ b/src/api/l_graphics_model.c @@ -3,8 +3,6 @@ #include "data/modelData.h" #include "core/maf.h" #include "util.h" -#include -#include // This adds about 2-3us of overhead, which sucks, but the reduction in complexity is large static int luax_callmodeldata(lua_State* L, const char* method, int nrets) { diff --git a/src/api/l_graphics_pass.c b/src/api/l_graphics_pass.c index 16232107..fb4053f2 100644 --- a/src/api/l_graphics_pass.c +++ b/src/api/l_graphics_pass.c @@ -4,8 +4,6 @@ #include "data/image.h" #include "core/maf.h" #include "util.h" -#include -#include #include #include diff --git a/src/api/l_graphics_readback.c b/src/api/l_graphics_readback.c index 761fa81f..a83d8578 100644 --- a/src/api/l_graphics_readback.c +++ b/src/api/l_graphics_readback.c @@ -3,8 +3,6 @@ #include "data/blob.h" #include "data/image.h" #include "util.h" -#include -#include static int l_lovrReadbackIsComplete(lua_State* L) { Readback* readback = luax_checktype(L, 1, Readback); diff --git a/src/api/l_graphics_sampler.c b/src/api/l_graphics_sampler.c index 8a27f443..6fb11087 100644 --- a/src/api/l_graphics_sampler.c +++ b/src/api/l_graphics_sampler.c @@ -1,8 +1,6 @@ #include "api.h" #include "graphics/graphics.h" #include "util.h" -#include -#include static int l_lovrSamplerGetFilter(lua_State* L) { Sampler* sampler = luax_checktype(L, 1, Sampler); diff --git a/src/api/l_graphics_shader.c b/src/api/l_graphics_shader.c index a36ccd91..d67555d2 100644 --- a/src/api/l_graphics_shader.c +++ b/src/api/l_graphics_shader.c @@ -1,8 +1,6 @@ #include "api.h" #include "graphics/graphics.h" #include "util.h" -#include -#include #include static int l_lovrShaderClone(lua_State* L) { diff --git a/src/api/l_graphics_tally.c b/src/api/l_graphics_tally.c index 178d4c1a..bc16b6ee 100644 --- a/src/api/l_graphics_tally.c +++ b/src/api/l_graphics_tally.c @@ -1,8 +1,6 @@ #include "api.h" #include "graphics/graphics.h" #include "util.h" -#include -#include static int l_lovrTallyGetType(lua_State* L) { Tally* tally = luax_checktype(L, 1, Tally); diff --git a/src/api/l_graphics_texture.c b/src/api/l_graphics_texture.c index 758d7870..a9c067df 100644 --- a/src/api/l_graphics_texture.c +++ b/src/api/l_graphics_texture.c @@ -1,8 +1,6 @@ #include "api.h" #include "util.h" #include "graphics/graphics.h" -#include -#include static int l_lovrTextureNewView(lua_State* L) { Texture* texture = luax_checktype(L, 1, Texture); diff --git a/src/api/l_headset.c b/src/api/l_headset.c index 362db538..4d661524 100644 --- a/src/api/l_headset.c +++ b/src/api/l_headset.c @@ -3,8 +3,6 @@ #include "data/modelData.h" #include "graphics/graphics.h" #include "core/maf.h" -#include -#include #include StringEntry lovrHeadsetDriver[] = { diff --git a/src/api/l_lovr.c b/src/api/l_lovr.c index 9966f404..f56bec80 100644 --- a/src/api/l_lovr.c +++ b/src/api/l_lovr.c @@ -1,7 +1,5 @@ #include "api.h" #include "util.h" -#include -#include static int l_lovrGetVersion(lua_State* L) { lua_pushinteger(L, LOVR_VERSION_MAJOR); diff --git a/src/api/l_math.c b/src/api/l_math.c index 7b32b22f..c875d3e7 100644 --- a/src/api/l_math.c +++ b/src/api/l_math.c @@ -4,8 +4,6 @@ #include "math/pool.h" #include "math/randomGenerator.h" #include "util.h" -#include -#include #include int l_lovrRandomGeneratorRandom(lua_State* L); diff --git a/src/api/l_math_curve.c b/src/api/l_math_curve.c index 89b26360..25e1d3c9 100644 --- a/src/api/l_math_curve.c +++ b/src/api/l_math_curve.c @@ -1,8 +1,6 @@ #include "api.h" #include "math/curve.h" #include "util.h" -#include -#include static int l_lovrCurveEvaluate(lua_State* L) { Curve* curve = luax_checktype(L, 1, Curve); diff --git a/src/api/l_math_randomGenerator.c b/src/api/l_math_randomGenerator.c index 9903bebc..e10564e9 100644 --- a/src/api/l_math_randomGenerator.c +++ b/src/api/l_math_randomGenerator.c @@ -1,8 +1,6 @@ #include "api.h" #include "math/randomGenerator.h" #include "util.h" -#include -#include #include static double luax_checkrandomseedpart(lua_State* L, int index) { diff --git a/src/api/l_math_vectors.c b/src/api/l_math_vectors.c index afd7bdd2..322c0613 100644 --- a/src/api/l_math_vectors.c +++ b/src/api/l_math_vectors.c @@ -1,8 +1,6 @@ #include "api.h" #include "core/maf.h" #include "util.h" -#include -#include #define EQ_THRESHOLD 1e-10f diff --git a/src/api/l_physics.c b/src/api/l_physics.c index 4ae7fe98..84cf8521 100644 --- a/src/api/l_physics.c +++ b/src/api/l_physics.c @@ -1,8 +1,6 @@ #include "api.h" #include "physics/physics.h" #include "util.h" -#include -#include StringEntry lovrShapeType[] = { [SHAPE_SPHERE] = ENTRY("sphere"), diff --git a/src/api/l_physics_collider.c b/src/api/l_physics_collider.c index d2a800d5..e6cbf808 100644 --- a/src/api/l_physics_collider.c +++ b/src/api/l_physics_collider.c @@ -2,8 +2,6 @@ #include "physics/physics.h" #include "core/maf.h" #include "util.h" -#include -#include #include static int l_lovrColliderDestroy(lua_State* L) { diff --git a/src/api/l_physics_joints.c b/src/api/l_physics_joints.c index 991dd5ac..2631e654 100644 --- a/src/api/l_physics_joints.c +++ b/src/api/l_physics_joints.c @@ -1,8 +1,6 @@ #include "api.h" #include "physics/physics.h" #include "util.h" -#include -#include #include void luax_pushjoint(lua_State* L, Joint* joint) { diff --git a/src/api/l_physics_shapes.c b/src/api/l_physics_shapes.c index a1cf3cf7..d69925aa 100644 --- a/src/api/l_physics_shapes.c +++ b/src/api/l_physics_shapes.c @@ -3,8 +3,6 @@ #include "data/image.h" #include "core/maf.h" #include "util.h" -#include -#include #include #include diff --git a/src/api/l_physics_world.c b/src/api/l_physics_world.c index 01737fbb..e756a954 100644 --- a/src/api/l_physics_world.c +++ b/src/api/l_physics_world.c @@ -1,8 +1,6 @@ #include "api.h" #include "physics/physics.h" #include "util.h" -#include -#include #include #include diff --git a/src/api/l_system.c b/src/api/l_system.c index 58f1fbe8..425cb17b 100644 --- a/src/api/l_system.c +++ b/src/api/l_system.c @@ -3,8 +3,6 @@ #include "data/image.h" #include "core/os.h" #include "util.h" -#include -#include #include StringEntry lovrKeyboardKey[] = { diff --git a/src/api/l_thread.c b/src/api/l_thread.c index 24549d33..e9714b36 100644 --- a/src/api/l_thread.c +++ b/src/api/l_thread.c @@ -3,8 +3,6 @@ #include "thread/thread.h" #include "thread/channel.h" #include "util.h" -#include -#include #include #include #include diff --git a/src/api/l_thread_channel.c b/src/api/l_thread_channel.c index 9bdd4667..19b1336f 100644 --- a/src/api/l_thread_channel.c +++ b/src/api/l_thread_channel.c @@ -2,8 +2,6 @@ #include "thread/channel.h" #include "event/event.h" #include "util.h" -#include -#include #include static void luax_checktimeout(lua_State* L, int index, double* timeout) { diff --git a/src/api/l_thread_thread.c b/src/api/l_thread_thread.c index 0d8576ee..109e9804 100644 --- a/src/api/l_thread_thread.c +++ b/src/api/l_thread_thread.c @@ -1,8 +1,6 @@ #include "api.h" #include "thread/thread.h" #include "util.h" -#include -#include static int l_lovrThreadStart(lua_State* L) { Thread* thread = luax_checktype(L, 1, Thread); diff --git a/src/api/l_timer.c b/src/api/l_timer.c index 48dfb170..81529a51 100644 --- a/src/api/l_timer.c +++ b/src/api/l_timer.c @@ -1,7 +1,5 @@ #include "api.h" #include "timer/timer.h" -#include -#include static int l_lovrTimerGetDelta(lua_State* L) { lua_pushnumber(L, lovrTimerGetDelta());