components/lua/patches/3.headers.patch
author Brian Utterback <brian.utterback@oracle.com>
Sun, 18 Oct 2015 17:18:20 -0700
branchs11u3-sru
changeset 5015 2cbe8ea880ce
parent 4226 efcbdc9d6dd8
permissions -rw-r--r--
20683411 ntpd and multiple default route constantly resets state and never sets sys.peer

Patch to src/luaconf.h is to adjust lua's default path for where it 
looks for .lua and lua related .so's

--- lua-5.1.4/src/lua.h.orig	2009-01-06 02:15:11.179130113 -0800
+++ lua-5.1.4/src/lua.h	2009-01-06 02:15:56.570695998 -0800
@@ -9,6 +9,10 @@
 #ifndef lua_h
 #define lua_h
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include <stdarg.h>
 #include <stddef.h>
 
@@ -384,5 +388,8 @@
 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************************/
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif
--- lua-5.1.4/src/lualib.h.orig	2009-01-06 02:15:19.193417835 -0800
+++ lua-5.1.4/src/lualib.h	2009-01-06 02:16:20.502288036 -0800
@@ -8,6 +8,10 @@
 #ifndef lualib_h
 #define lualib_h
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "lua.h"
 
 
@@ -49,5 +53,8 @@
 #define lua_assert(x)	((void)0)
 #endif
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif
--- lua-5.1.4/src/lauxlib.h.orig	2009-01-06 02:15:37.967244620 -0800
+++ lua-5.1.4/src/lauxlib.h	2009-01-06 02:16:26.398180986 -0800
@@ -8,6 +8,9 @@
 #ifndef lauxlib_h
 #define lauxlib_h
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 #include <stddef.h>
 #include <stdio.h>
@@ -169,6 +172,10 @@
 
 #define luaL_reg	luaL_Reg
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
 
 
--- lua-5.1.4/src/luaconf.h	Wed Apr 29 11:49:07 2015
+++ lua-5.1.4/src/luaconf.h	Wed Apr 29 12:50:39 2015
@@ -94,7 +94,7 @@
 	".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
 
 #else
-#define LUA_ROOT	"/usr/local/"
+#define LUA_ROOT	"/usr/"
 #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
 #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
 #define LUA_PATH_DEFAULT  \