Просмотр исходного кода

Set LUA_UCID to allow non-ASCII identifiers in Lua

bel2125 4 лет назад
Родитель
Сommit
70438abf81

+ 1 - 1
VisualStudio/civetweb_lua/civetweb_lua.vcxproj

@@ -119,7 +119,7 @@
       </PrecompiledHeader>
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>NO_HTTP2;USE_SERVER_STATS;USE_DUKTAPE;USE_IPV6;LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;USE_WEBSOCKET;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>OPENSSL_API_1_1;NO_HTTP2;USE_SERVER_STATS;USE_DUKTAPE;USE_IPV6;LUA_COMPAT_ALL;USE_LUA;USE_LUA_SQLITE3;USE_LUA_FILE_SYSTEM;USE_WEBSOCKET;WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;$(ProjectDir)..\..\src\third_party\duktape-1.5.2\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\include;$(ProjectDir)..\..\src\third_party;$(ProjectDir)..\..\src\third_party\lua-5.2.4\src;$(ProjectDir)..\..\src\third_party\duktape-1.5.2\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     </ClCompile>
     <Link>
     <Link>

+ 1 - 1
resources/Makefile.in-lua

@@ -49,7 +49,7 @@ endif
 
 
 
 
 # Add flags for all Lua versions
 # Add flags for all Lua versions
-LUA_CFLAGS += -I$(LUA_DIR) -DLUA_COMPAT_ALL -DUSE_LUA
+LUA_CFLAGS += -I$(LUA_DIR) -DLUA_COMPAT_ALL -DUSE_LUA -DLUA_UCID
 
 
 ifneq ($(TARGET_OS),WIN32)
 ifneq ($(TARGET_OS),WIN32)
   LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN
   LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN

+ 6 - 0
src/third_party/civetweb_lua.h

@@ -30,9 +30,15 @@
 #define LUA_COMPAT_LOG10
 #define LUA_COMPAT_LOG10
 #define LUA_COMPAT_APIINTCASTS
 #define LUA_COMPAT_APIINTCASTS
 
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
 #include "lauxlib.h"
 #include "lauxlib.h"
 #include "lua.h"
 #include "lua.h"
 #include "lualib.h"
 #include "lualib.h"
+#if defined(__cplusplus)
+} /* extern "C" */
+#endif
 
 
 #ifndef LUA_VERSION_NUM
 #ifndef LUA_VERSION_NUM
 #error "Unknown Lua version"
 #error "Unknown Lua version"