Permalink
Browse files

Added 64-bit Windows support.

Updated existing windows sample projects and new project template to have x64 targets in addition to x86/Win32.
Rebuilt all windows dependency libs and removed zlib.dll as zlib is now built as a static library.
Note that any Windows projects generated with the old "new project script" will no longer link correctly with these changes since library paths have changed. Old projects will need to append /x86 to their windows lib paths.

Fixes #215
  • Loading branch information...
1 parent 1a7b584 commit c03bf9ab9d999704c8326cf1d20fd7771afe340d @sgrenier sgrenier committed Oct 22, 2012
Showing with 3,272 additions and 1,242 deletions.
  1. BIN bin/windows/OpenAL32.dll
  2. BIN bin/windows/gameplay-encoder.exe
  3. BIN bin/windows/x64/OpenAL32.dll
  4. BIN bin/windows/x86/OpenAL32.dll
  5. BIN bin/windows/zlib.dll
  6. +19 −0 external-deps/README.md
  7. BIN external-deps/bullet/lib/windows/BulletCollision.lib
  8. BIN external-deps/bullet/lib/windows/BulletDynamics.lib
  9. BIN external-deps/bullet/lib/windows/LinearMath.lib
  10. BIN external-deps/bullet/lib/windows/x64/BulletCollision.lib
  11. BIN external-deps/bullet/lib/windows/x64/BulletDynamics.lib
  12. BIN external-deps/bullet/lib/windows/x64/LinearMath.lib
  13. BIN external-deps/bullet/lib/windows/x86/BulletCollision.lib
  14. BIN external-deps/bullet/lib/windows/x86/BulletDynamics.lib
  15. BIN external-deps/bullet/lib/windows/x86/LinearMath.lib
  16. +1 −0 external-deps/bullet/version.txt
  17. BIN external-deps/collada-dom/lib/windows/{ → x86}/libcollada14dom22-d.lib
  18. +1 −0 external-deps/collada-dom/version.txt
  19. BIN external-deps/freetype2/lib/windows/{ → x86}/freetype245.lib
  20. BIN external-deps/glew/lib/windows/glew32.lib
  21. BIN external-deps/glew/lib/windows/x64/glew32.lib
  22. BIN external-deps/glew/lib/windows/x86/glew32.lib
  23. +1 −0 external-deps/glew/version.txt
  24. BIN external-deps/libpng/lib/windows/libpng14.lib
  25. BIN external-deps/libpng/lib/windows/x64/libpng14.lib
  26. BIN external-deps/libpng/lib/windows/x86/libpng14.lib
  27. +1 −0 external-deps/libpng/version.txt
  28. +2 −3 external-deps/lua/include/lfunc.h
  29. +9 −1 external-deps/lua/include/lgc.h
  30. +12 −5 external-deps/lua/include/llimits.h
  31. +44 −31 external-deps/lua/include/lobject.h
  32. +3 −3 external-deps/lua/include/lparser.h
  33. +14 −6 external-deps/lua/include/lstate.h
  34. +13 −4 external-deps/lua/include/lstring.h
  35. +4 −4 external-deps/lua/include/lua.h
  36. +60 −43 external-deps/lua/include/luaconf.h
  37. +2 −2 external-deps/lua/include/lundump.h
  38. BIN external-deps/lua/lib/windows/lua.lib
  39. BIN external-deps/lua/lib/windows/x64/lua.lib
  40. BIN external-deps/lua/lib/windows/x86/lua.lib
  41. +1 −0 external-deps/lua/version.txt
  42. BIN external-deps/oggvorbis/lib/windows/libvorbisfile.lib
  43. BIN external-deps/oggvorbis/lib/windows/x64/libogg.lib
  44. BIN external-deps/oggvorbis/lib/windows/x64/libvorbis.lib
  45. BIN external-deps/oggvorbis/lib/windows/x64/libvorbisfile.lib
  46. BIN external-deps/oggvorbis/lib/windows/{ → x86}/libogg.lib
  47. BIN external-deps/oggvorbis/lib/windows/{ → x86}/libvorbis.lib
  48. BIN external-deps/oggvorbis/lib/windows/x86/libvorbisfile.lib
  49. +1 −0 external-deps/oggvorbis/version.txt
  50. BIN external-deps/openal/lib/windows/OpenAL32.lib
  51. BIN external-deps/openal/lib/windows/x64/OpenAL32.lib
  52. BIN external-deps/openal/lib/windows/x86/OpenAL32.lib
  53. +1 −0 external-deps/openal/version.txt
  54. BIN external-deps/zlib/lib/windows/x64/zlib.lib
  55. BIN external-deps/zlib/lib/windows/x86/zlib.lib
  56. BIN external-deps/zlib/lib/windows/zlib.lib
  57. +1 −0 external-deps/zlib/version.txt
  58. +2 −2 gameplay-encoder/gameplay-encoder.vcxproj
  59. +4 −2 gameplay-encoder/gameplay-encoder.vcxproj.user
  60. +5 −0 gameplay-luagen/src/FunctionBinding.cpp
  61. +155 −4 gameplay-samples/sample00-mesh/sample00-mesh.vcxproj
  62. +16 −4 gameplay-samples/sample00-mesh/sample00-mesh.vcxproj.user
  63. +111 −4 gameplay-samples/sample01-longboard/sample01-longboard.vcxproj
  64. +16 −4 gameplay-samples/sample01-longboard/sample01-longboard.vcxproj.user
  65. +147 −4 gameplay-samples/sample02-spaceship/sample02-spaceship.vcxproj
  66. +16 −4 gameplay-samples/sample02-spaceship/sample02-spaceship.vcxproj.user
  67. +2 −2 gameplay-samples/sample02-spaceship/src/SpaceshipGame.cpp
  68. +143 −4 gameplay-samples/sample03-character/sample03-character.vcxproj
  69. +16 −4 gameplay-samples/sample03-character/sample03-character.vcxproj.user
  70. +155 −4 gameplay-samples/sample04-particles/sample04-particles.vcxproj
  71. +17 −5 gameplay-samples/sample04-particles/sample04-particles.vcxproj.user
  72. +155 −4 gameplay-samples/sample05-lua/sample05-lua.vcxproj
  73. +15 −3 gameplay-samples/sample05-lua/sample05-lua.vcxproj.user
  74. +149 −4 gameplay-samples/sample06-racer/sample06-racer.vcxproj
  75. +17 −5 gameplay-samples/sample06-racer/sample06-racer.vcxproj.user
  76. +1 −1 gameplay-samples/sample06-racer/src/RacerGame.cpp
  77. +153 −5 gameplay-template/gameplay-template.vcxproj
  78. +15 −3 gameplay-template/gameplay-template.vcxproj.user
  79. +155 −4 gameplay-tests/gameplay-tests.vcxproj
  80. +15 −3 gameplay-tests/gameplay-tests.vcxproj.user
  81. +1 −1 gameplay-tests/src/MeshBatchTest.cpp
  82. +3 −3 gameplay-tests/src/TestsGame.cpp
  83. +132 −75 gameplay.sln
  84. +126 −6 gameplay/gameplay.vcxproj
  85. +1 −2 gameplay/src/AbsoluteLayout.cpp
  86. +1 −1 gameplay/src/Animation.cpp
  87. +2 −3 gameplay/src/AnimationClip.cpp
  88. +8 −9 gameplay/src/Bundle.cpp
  89. +3 −4 gameplay/src/Container.cpp
  90. +1 −1 gameplay/src/Effect.cpp
  91. +1 −2 gameplay/src/FlowLayout.cpp
  92. +21 −21 gameplay/src/Font.cpp
  93. +1 −1 gameplay/src/Font.h
  94. +1 −1 gameplay/src/Game.cpp
  95. +1 −1 gameplay/src/Game.inl
  96. +1 −1 gameplay/src/Image.cpp
  97. +3 −3 gameplay/src/Material.cpp
  98. +6 −7 gameplay/src/MeshSkin.cpp
  99. +1 −1 gameplay/src/Node.cpp
  100. +5 −5 gameplay/src/PhysicsController.cpp
  101. +2 −2 gameplay/src/PhysicsVehicle.cpp
  102. +1 −1 gameplay/src/PlatformWindows.cpp
  103. +5 −8 gameplay/src/Properties.cpp
  104. +9 −3 gameplay/src/RenderState.cpp
  105. +1 −1 gameplay/src/RenderState.h
  106. +1 −0 gameplay/src/RenderTarget.h
  107. +8 −8 gameplay/src/SceneLoader.cpp
  108. +4 −4 gameplay/src/ScriptController.cpp
  109. +2 −2 gameplay/src/ScriptController.inl
  110. +3 −3 gameplay/src/Technique.cpp
  111. +1 −1 gameplay/src/TextBox.cpp
  112. +4 −4 gameplay/src/Texture.cpp
  113. +6 −6 gameplay/src/Theme.cpp
  114. +3 −3 gameplay/src/Transform.cpp
  115. +1 −1 gameplay/src/VertexAttributeBinding.cpp
  116. +2 −2 gameplay/src/VertexFormat.cpp
  117. +3 −3 gameplay/src/VerticalLayout.cpp
  118. +6 −6 gameplay/src/lua/lua_AnimationTarget.cpp
  119. +55 −55 gameplay/src/lua/lua_Button.cpp
  120. +57 −57 gameplay/src/lua/lua_CheckBox.cpp
  121. +60 −60 gameplay/src/lua/lua_Container.cpp
  122. +54 −54 gameplay/src/lua/lua_Control.cpp
  123. +76 −0 gameplay/src/lua/lua_DepthStencilTarget.cpp
  124. +2 −0 gameplay/src/lua/lua_DepthStencilTarget.h
  125. +63 −63 gameplay/src/lua/lua_Form.cpp
  126. +31 −1 gameplay/src/lua/lua_FrameBuffer.cpp
  127. +38 −0 gameplay/src/lua/lua_Game.cpp
  128. +1 −0 gameplay/src/lua/lua_Game.h
  129. +1 −0 gameplay/src/lua/lua_Global.cpp
  130. +88 −88 gameplay/src/lua/lua_Joint.cpp
  131. +57 −57 gameplay/src/lua/lua_Joystick.cpp
  132. +55 −55 gameplay/src/lua/lua_Label.cpp
  133. +30 −30 gameplay/src/lua/lua_MaterialParameter.cpp
  134. +88 −88 gameplay/src/lua/lua_Node.cpp
  135. +29 −0 gameplay/src/lua/lua_Platform.cpp
  136. +1 −0 gameplay/src/lua/lua_Platform.h
  137. +58 −58 gameplay/src/lua/lua_RadioButton.cpp
  138. +111 −1 gameplay/src/lua/lua_RenderTarget.cpp
  139. +2 −0 gameplay/src/lua/lua_RenderTarget.h
  140. +59 −59 gameplay/src/lua/lua_Slider.cpp
  141. +55 −55 gameplay/src/lua/lua_TextBox.cpp
  142. +72 −1 gameplay/src/lua/lua_Texture.cpp
  143. +6 −1 gameplay/src/lua/lua_TextureFormat.cpp
  144. +72 −72 gameplay/src/lua/lua_Transform.cpp
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
@@ -0,0 +1,19 @@
+## GamePlay External Dependencies
+
+A pre-built version of all required external dependencies is included here for convenience. However, you may at some point wish to rebuild some or all of the external depencies if for example you want to target a different processor, build with a different character encoding, etc.
+
+Each external library folder includes a 'version.txt' file that lists the current version of the external library that is expected by GamePlay, so ensure you grab the correct source code version when building libraries.
+
+Generally you should build external libraries in Release mode, not Debug, unless you have a specific need to debug the third party libraries.
+
+Platform-specific instructions are below.
+
+## Windows (Microsoft Visual Studio)
+
+1. Select the character encoding to match GamePlay libraries (Unicode by default)
+
+2. Turn off Whole Program Optimization on General page
+
+3. Make sure Multi-threaded DLL (/MD) is specified on C/C++ -> Code Generation page
+
+4. Make sure the "Debug Information Format" option is cleared (no /Zx option specified on command-line) on the C/C++ -> General page
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1 @@
+2.79
@@ -0,0 +1 @@
+2.2
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1 @@
+1.9.0
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1 @@
+1.4.8
@@ -1,5 +1,5 @@
/*
-** $Id: lfunc.h,v 2.6 2010/06/04 13:06:15 roberto Exp $
+** $Id: lfunc.h,v 2.8 2012/05/08 13:53:33 roberto Exp $
** Auxiliary functions to manipulate prototypes and closures
** See Copyright Notice in lua.h
*/
@@ -20,12 +20,11 @@
LUAI_FUNC Proto *luaF_newproto (lua_State *L);
LUAI_FUNC Closure *luaF_newCclosure (lua_State *L, int nelems);
-LUAI_FUNC Closure *luaF_newLclosure (lua_State *L, Proto *p);
+LUAI_FUNC Closure *luaF_newLclosure (lua_State *L, int nelems);
LUAI_FUNC UpVal *luaF_newupval (lua_State *L);
LUAI_FUNC UpVal *luaF_findupval (lua_State *L, StkId level);
LUAI_FUNC void luaF_close (lua_State *L, StkId level);
LUAI_FUNC void luaF_freeproto (lua_State *L, Proto *f);
-LUAI_FUNC void luaF_freeclosure (lua_State *L, Closure *c);
LUAI_FUNC void luaF_freeupval (lua_State *L, UpVal *uv);
LUAI_FUNC const char *luaF_getlocalname (const Proto *func, int local_number,
int pc);
@@ -1,5 +1,5 @@
/*
-** $Id: lgc.h,v 2.52 2011/10/03 17:54:25 roberto Exp $
+** $Id: lgc.h,v 2.56 2012/05/23 15:43:14 roberto Exp $
** Garbage Collector
** See Copyright Notice in lua.h
*/
@@ -25,6 +25,14 @@
*/
+
+/* how much to allocate before next GC step */
+#if !defined(GCSTEPSIZE)
+/* ~100 small strings */
+#define GCSTEPSIZE (cast_int(100 * sizeof(TString)))
+#endif
+
+
/*
** Possible states of the Garbage Collector
*/
@@ -1,5 +1,5 @@
/*
-** $Id: llimits.h,v 1.95 2011/12/06 16:58:36 roberto Exp $
+** $Id: llimits.h,v 1.99 2012/05/28 20:32:28 roberto Exp $
** Limits, basic types, and some other `installation-dependent' definitions
** See Copyright Notice in lua.h
*/
@@ -31,6 +31,8 @@ typedef unsigned char lu_byte;
#define MAX_LUMEM ((lu_mem)(~(lu_mem)0)-2)
+#define MAX_LMEM ((l_mem) ((MAX_LUMEM >> 1) - 2))
+
#define MAX_INT (INT_MAX-2) /* maximum value of an int (-2 for safety) */
@@ -209,31 +211,36 @@ typedef lu_int32 Instruction;
#elif defined(LUA_IEEE754TRICK) /* }{ */
/* the next trick should work on any machine using IEEE754 with
- a 32-bit integer type */
+ a 32-bit int type */
union luai_Cast { double l_d; LUA_INT32 l_p[2]; };
#if !defined(LUA_IEEEENDIAN) /* { */
#define LUAI_EXTRAIEEE \
static const union luai_Cast ieeeendian = {-(33.0 + 6755399441055744.0)};
-#define LUA_IEEEENDIAN (ieeeendian.l_p[1] == 33)
+#define LUA_IEEEENDIANLOC (ieeeendian.l_p[1] == 33)
#else
+#define LUA_IEEEENDIANLOC LUA_IEEEENDIAN
#define LUAI_EXTRAIEEE /* empty */
#endif /* } */
#define lua_number2int32(i,n,t) \
{ LUAI_EXTRAIEEE \
volatile union luai_Cast u; u.l_d = (n) + 6755399441055744.0; \
- (i) = (t)u.l_p[LUA_IEEEENDIAN]; }
+ (i) = (t)u.l_p[LUA_IEEEENDIANLOC]; }
#define luai_hashnum(i,n) \
{ volatile union luai_Cast u; u.l_d = (n) + 1.0; /* avoid -0 */ \
(i) = u.l_p[0]; (i) += u.l_p[1]; } /* add double bits for his hash */
#define lua_number2int(i,n) lua_number2int32(i, n, int)
-#define lua_number2integer(i,n) lua_number2int32(i, n, lua_Integer)
#define lua_number2unsigned(i,n) lua_number2int32(i, n, lua_Unsigned)
+/* the trick can be expanded to lua_Integer when it is a 32-bit value */
+#if defined(LUA_IEEELL)
+#define lua_number2integer(i,n) lua_number2int32(i, n, lua_Integer)
+#endif
+
#endif /* } */
@@ -1,5 +1,5 @@
/*
-** $Id: lobject.h,v 2.64 2011/10/31 17:48:22 roberto Exp $
+** $Id: lobject.h,v 2.70 2012/05/11 14:10:50 roberto Exp $
** Type definitions for Lua objects
** See Copyright Notice in lua.h
*/
@@ -36,6 +36,9 @@
** bit 6: whether value is collectable
*/
+#define VARBITS (3 << 4)
+
+
/*
** LUA_TFUNCTION variants:
** 0 - Lua function
@@ -49,6 +52,12 @@
#define LUA_TCCL (LUA_TFUNCTION | (2 << 4)) /* C closure */
+/*
+** LUA_TSTRING variants */
+#define LUA_TSHRSTR (LUA_TSTRING | (0 << 4)) /* short strings */
+#define LUA_TLNGSTR (LUA_TSTRING | (1 << 4)) /* long strings */
+
+
/* Bit mark for collectable types */
#define BIT_ISCOLLECTABLE (1 << 6)
@@ -109,23 +118,28 @@ typedef struct lua_TValue TValue;
/* raw type tag of a TValue */
#define rttype(o) ((o)->tt_)
+/* tag with no variants (bits 0-3) */
+#define novariant(x) ((x) & 0x0F)
+
/* type tag of a TValue (bits 0-3 for tags + variant bits 4-5) */
#define ttype(o) (rttype(o) & 0x3F)
-
/* type tag of a TValue with no variants (bits 0-3) */
-#define ttypenv(o) (rttype(o) & 0x0F)
+#define ttypenv(o) (novariant(rttype(o)))
/* Macros to test type */
#define checktag(o,t) (rttype(o) == (t))
+#define checktype(o,t) (ttypenv(o) == (t))
#define ttisnumber(o) checktag((o), LUA_TNUMBER)
#define ttisnil(o) checktag((o), LUA_TNIL)
#define ttisboolean(o) checktag((o), LUA_TBOOLEAN)
#define ttislightuserdata(o) checktag((o), LUA_TLIGHTUSERDATA)
-#define ttisstring(o) checktag((o), ctb(LUA_TSTRING))
+#define ttisstring(o) checktype((o), LUA_TSTRING)
+#define ttisshrstring(o) checktag((o), ctb(LUA_TSHRSTR))
+#define ttislngstring(o) checktag((o), ctb(LUA_TLNGSTR))
#define ttistable(o) checktag((o), ctb(LUA_TTABLE))
-#define ttisfunction(o) (ttypenv(o) == LUA_TFUNCTION)
+#define ttisfunction(o) checktype(o, LUA_TFUNCTION)
#define ttisclosure(o) ((rttype(o) & 0x1F) == LUA_TFUNCTION)
#define ttisCclosure(o) checktag((o), ctb(LUA_TCCL))
#define ttisLclosure(o) checktag((o), ctb(LUA_TLCL))
@@ -161,7 +175,7 @@ typedef struct lua_TValue TValue;
/* Macros for internal tests */
-#define righttt(obj) (ttypenv(obj) == gcvalue(obj)->gch.tt)
+#define righttt(obj) (ttype(obj) == gcvalue(obj)->gch.tt)
#define checkliveness(g,obj) \
lua_longassert(!iscollectable(obj) || \
@@ -193,7 +207,8 @@ typedef struct lua_TValue TValue;
#define setsvalue(L,obj,x) \
{ TValue *io=(obj); \
- val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TSTRING)); \
+ TString *x_ = (x); \
+ val_(io).gc=cast(GCObject *, x_); settt_(io, ctb(x_->tsv.tt)); \
checkliveness(G(L),io); }
#define setuvalue(L,obj,x) \
@@ -221,11 +236,6 @@ typedef struct lua_TValue TValue;
val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TTABLE)); \
checkliveness(G(L),io); }
-#define setptvalue(L,obj,x) \
- { TValue *io=(obj); \
- val_(io).gc=cast(GCObject *, (x)); settt_(io, ctb(LUA_TPROTO)); \
- checkliveness(G(L),io); }
-
#define setdeadvalue(obj) settt_(obj, LUA_TDEADKEY)
@@ -256,33 +266,40 @@ typedef struct lua_TValue TValue;
#define setsvalue2n setsvalue
+/* check whether a number is valid (useful only for NaN trick) */
+#define luai_checknum(L,o,c) { /* empty */ }
/*
** {======================================================
** NaN Trick
** =======================================================
*/
-
-#if defined(LUA_NANTRICK) \
- || defined(LUA_NANTRICK_LE) \
- || defined(LUA_NANTRICK_BE)
+#if defined(LUA_NANTRICK)
/*
** numbers are represented in the 'd_' field. All other values have the
** value (NNMARK | tag) in 'tt__'. A number with such pattern would be
** a "signaled NaN", which is never generated by regular operations by
** the CPU (nor by 'strtod')
*/
-#if !defined(NNMARK)
+
+/* allows for external implementation for part of the trick */
+#if !defined(NNMARK) /* { */
+
+
+#if !defined(LUA_IEEEENDIAN)
+#error option 'LUA_NANTRICK' needs 'LUA_IEEEENDIAN'
+#endif
+
+
#define NNMARK 0x7FF7A500
#define NNMASK 0x7FFFFF00
-#endif
#undef TValuefields
#undef NILCONSTANT
-#if defined(LUA_NANTRICK_LE)
+#if (LUA_IEEEENDIAN == 0) /* { */
/* little endian */
#define TValuefields \
@@ -293,7 +310,7 @@ typedef struct lua_TValue TValue;
#define d_(o) ((o)->u.d__)
#define tt_(o) ((o)->u.i.tt__)
-#elif defined(LUA_NANTRICK_BE)
+#else /* }{ */
/* big endian */
#define TValuefields \
@@ -304,10 +321,9 @@ typedef struct lua_TValue TValue;
#define d_(o) ((o)->u.d__)
#define tt_(o) ((o)->u.i.tt__)
-#elif !defined(TValuefields)
-#error option 'LUA_NANTRICK' needs declaration for 'TValuefields'
+#endif /* } */
-#endif
+#endif /* } */
/* correspondence with standard representation */
@@ -348,21 +364,18 @@ typedef struct lua_TValue TValue;
*/
#undef checktag
+#undef checktype
#define checktag(o,t) (tt_(o) == tag2tt(t))
+#define checktype(o,t) (ctb(tt_(o) | VARBITS) == ctb(tag2tt(t) | VARBITS))
#undef ttisequal
#define ttisequal(o1,o2) \
(ttisnumber(o1) ? ttisnumber(o2) : (tt_(o1) == tt_(o2)))
-
+#undef luai_checknum
#define luai_checknum(L,o,c) { if (!ttisnumber(o)) c; }
-
-#else
-
-#define luai_checknum(L,o,c) { /* empty */ }
-
#endif
/* }====================================================== */
@@ -401,7 +414,7 @@ typedef union TString {
L_Umaxalign dummy; /* ensures maximum alignment for strings */
struct {
CommonHeader;
- lu_byte reserved;
+ lu_byte extra; /* reserved words for short strings; "has hash" for longs */
unsigned int hash;
size_t len; /* number of characters in string */
} tsv;
@@ -501,7 +514,7 @@ typedef struct UpVal {
*/
#define ClosureHeader \
- CommonHeader; lu_byte isC; lu_byte nupvalues; GCObject *gclist
+ CommonHeader; lu_byte nupvalues; GCObject *gclist
typedef struct CClosure {
ClosureHeader;
@@ -1,5 +1,5 @@
/*
-** $Id: lparser.h,v 1.69 2011/07/27 18:09:01 roberto Exp $
+** $Id: lparser.h,v 1.70 2012/05/08 13:53:33 roberto Exp $
** Lua Parser
** See Copyright Notice in lua.h
*/
@@ -112,8 +112,8 @@ typedef struct FuncState {
} FuncState;
-LUAI_FUNC Proto *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff,
- Dyndata *dyd, const char *name, int firstchar);
+LUAI_FUNC Closure *luaY_parser (lua_State *L, ZIO *z, Mbuffer *buff,
+ Dyndata *dyd, const char *name, int firstchar);
#endif
Oops, something went wrong.

0 comments on commit c03bf9a

Please sign in to comment.