| author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
| Tue, 13 Jan 2015 09:09:22 -0800 | |
| changeset 3628 | d165e4d5af9a |
| parent 1265 | d6a57c34a9a2 |
| permissions | -rw-r--r-- |
|
1265
d6a57c34a9a2
15824627 SUNBT7206171 Still problems with lua 5.2.1 integration
Rich Burridge <rich.burridge@oracle.com>
parents:
1021
diff
changeset
|
1 |
Patch to src/luaconf.h is to adjust lua's default path for where it |
|
d6a57c34a9a2
15824627 SUNBT7206171 Still problems with lua 5.2.1 integration
Rich Burridge <rich.burridge@oracle.com>
parents:
1021
diff
changeset
|
2 |
looks for .lua and lua related .so's |
|
d6a57c34a9a2
15824627 SUNBT7206171 Still problems with lua 5.2.1 integration
Rich Burridge <rich.burridge@oracle.com>
parents:
1021
diff
changeset
|
3 |
|
|
1021
93e0813581a0
7204561 Lua header (lauxlib.h) is broken
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents:
990
diff
changeset
|
4 |
--- src/lua.h.~1~ Fri Apr 20 06:18:26 2012 |
|
93e0813581a0
7204561 Lua header (lauxlib.h) is broken
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents:
990
diff
changeset
|
5 |
+++ src/lua.h Tue Oct 16 16:37:24 2012 |
|
97
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
6 |
@@ -9,6 +9,10 @@ |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
7 |
#ifndef lua_h |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
8 |
#define lua_h |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
9 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
10 |
+#ifdef __cplusplus |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
11 |
+extern "C" {
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
12 |
+#endif |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
13 |
+ |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
14 |
#include <stdarg.h> |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
15 |
#include <stddef.h> |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
16 |
|
|
1021
93e0813581a0
7204561 Lua header (lauxlib.h) is broken
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents:
990
diff
changeset
|
17 |
@@ -435,5 +439,8 @@ |
|
97
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
18 |
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
19 |
******************************************************************************/ |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
20 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
21 |
+#ifdef __cplusplus |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
22 |
+} |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
23 |
+#endif |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
24 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
25 |
#endif |
|
1021
93e0813581a0
7204561 Lua header (lauxlib.h) is broken
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents:
990
diff
changeset
|
26 |
|
|
93e0813581a0
7204561 Lua header (lauxlib.h) is broken
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents:
990
diff
changeset
|
27 |
--- src/lualib.h.~1~ Thu Dec 8 04:11:37 2011 |
|
93e0813581a0
7204561 Lua header (lauxlib.h) is broken
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents:
990
diff
changeset
|
28 |
+++ src/lualib.h Tue Oct 16 16:34:40 2012 |
|
97
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
29 |
@@ -8,6 +8,10 @@ |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
30 |
#ifndef lualib_h |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
31 |
#define lualib_h |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
32 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
33 |
+#ifdef __cplusplus |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
34 |
+extern "C" {
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
35 |
+#endif |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
36 |
+ |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
37 |
#include "lua.h" |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
38 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
39 |
|
|
1021
93e0813581a0
7204561 Lua header (lauxlib.h) is broken
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents:
990
diff
changeset
|
40 |
@@ -51,5 +55,8 @@ |
|
97
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
41 |
#define lua_assert(x) ((void)0) |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
42 |
#endif |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
43 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
44 |
+#ifdef __cplusplus |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
45 |
+} |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
46 |
+#endif |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
47 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
48 |
#endif |
|
1021
93e0813581a0
7204561 Lua header (lauxlib.h) is broken
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents:
990
diff
changeset
|
49 |
--- src/lauxlib.h.~1~ Tue Nov 29 07:55:08 2011 |
|
93e0813581a0
7204561 Lua header (lauxlib.h) is broken
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents:
990
diff
changeset
|
50 |
+++ src/lauxlib.h Tue Oct 16 16:34:40 2012 |
|
97
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
51 |
@@ -8,6 +8,9 @@ |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
52 |
#ifndef lauxlib_h |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
53 |
#define lauxlib_h |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
54 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
55 |
+#ifdef __cplusplus |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
56 |
+extern "C" {
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
57 |
+#endif |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
58 |
|
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
59 |
#include <stddef.h> |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
60 |
#include <stdio.h> |
|
1021
93e0813581a0
7204561 Lua header (lauxlib.h) is broken
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents:
990
diff
changeset
|
61 |
@@ -206,7 +209,9 @@ |
|
97
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
62 |
|
|
1021
93e0813581a0
7204561 Lua header (lauxlib.h) is broken
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents:
990
diff
changeset
|
63 |
#endif |
|
97
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
64 |
|
|
1021
93e0813581a0
7204561 Lua header (lauxlib.h) is broken
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents:
990
diff
changeset
|
65 |
- |
|
97
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
66 |
+#ifdef __cplusplus |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
67 |
+} |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
68 |
#endif |
|
c27cb2d7067c
7020451 Move lua to Userland
Srinivasa Sarva <srinivasa.sarva@oracle.com>
parents:
diff
changeset
|
69 |
|
|
1021
93e0813581a0
7204561 Lua header (lauxlib.h) is broken
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents:
990
diff
changeset
|
70 |
+#endif |
|
93e0813581a0
7204561 Lua header (lauxlib.h) is broken
Srinivasa Sarva <Srinivasa.Sarva@oracle.com>
parents:
990
diff
changeset
|
71 |
|
|
1265
d6a57c34a9a2
15824627 SUNBT7206171 Still problems with lua 5.2.1 integration
Rich Burridge <rich.burridge@oracle.com>
parents:
1021
diff
changeset
|
72 |
|
|
d6a57c34a9a2
15824627 SUNBT7206171 Still problems with lua 5.2.1 integration
Rich Burridge <rich.burridge@oracle.com>
parents:
1021
diff
changeset
|
73 |
--- src/luaconf.h.orig 2012-10-25 08:39:30.502881780 -0700 |
|
d6a57c34a9a2
15824627 SUNBT7206171 Still problems with lua 5.2.1 integration
Rich Burridge <rich.burridge@oracle.com>
parents:
1021
diff
changeset
|
74 |
+++ src/luaconf.h 2012-10-25 08:40:00.726463215 -0700 |
|
d6a57c34a9a2
15824627 SUNBT7206171 Still problems with lua 5.2.1 integration
Rich Burridge <rich.burridge@oracle.com>
parents:
1021
diff
changeset
|
75 |
@@ -100,7 +100,7 @@ |
|
d6a57c34a9a2
15824627 SUNBT7206171 Still problems with lua 5.2.1 integration
Rich Burridge <rich.burridge@oracle.com>
parents:
1021
diff
changeset
|
76 |
#else /* }{ */
|
|
d6a57c34a9a2
15824627 SUNBT7206171 Still problems with lua 5.2.1 integration
Rich Burridge <rich.burridge@oracle.com>
parents:
1021
diff
changeset
|
77 |
|
|
d6a57c34a9a2
15824627 SUNBT7206171 Still problems with lua 5.2.1 integration
Rich Burridge <rich.burridge@oracle.com>
parents:
1021
diff
changeset
|
78 |
#define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/" |
|
d6a57c34a9a2
15824627 SUNBT7206171 Still problems with lua 5.2.1 integration
Rich Burridge <rich.burridge@oracle.com>
parents:
1021
diff
changeset
|
79 |
-#define LUA_ROOT "/usr/local/" |
|
d6a57c34a9a2
15824627 SUNBT7206171 Still problems with lua 5.2.1 integration
Rich Burridge <rich.burridge@oracle.com>
parents:
1021
diff
changeset
|
80 |
+#define LUA_ROOT "/usr/" |
|
d6a57c34a9a2
15824627 SUNBT7206171 Still problems with lua 5.2.1 integration
Rich Burridge <rich.burridge@oracle.com>
parents:
1021
diff
changeset
|
81 |
#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR |
|
d6a57c34a9a2
15824627 SUNBT7206171 Still problems with lua 5.2.1 integration
Rich Burridge <rich.burridge@oracle.com>
parents:
1021
diff
changeset
|
82 |
#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR |
|
d6a57c34a9a2
15824627 SUNBT7206171 Still problems with lua 5.2.1 integration
Rich Burridge <rich.burridge@oracle.com>
parents:
1021
diff
changeset
|
83 |
#define LUA_PATH_DEFAULT \ |