2 files changed, 200 insertions, 126 deletions

diff --git a/loadlib.c b/loadlib.c
index 2d3b261c..1b8925c0 100644
--- a/loadlib.c
+++ b/loadlib.c
@@ -1,5 +1,5 @@
 /*
-** $Id: loadlib.c,v 1.21 2005/03/09 16:28:07 roberto Exp roberto $
+** $Id: loadlib.c,v 1.22 2005/03/18 16:38:43 roberto Exp roberto $
 ** Dynamic library loader for Lua
 ** See Copyright Notice in lua.h
 **
@@ -44,7 +44,7 @@ static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym);
 
 
 
-#if defined(LUA_USE_DLOPEN)
+#if defined(LUA_DL_DLOPEN)
 /*
 ** {========================================================================
 ** This is an implementation of loadlib based on the dlfcn interface.
@@ -78,7 +78,7 @@ static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) {
 
 
 
-#elif defined(LUA_USE_DLL)
+#elif defined(LUA_DL_DLL)
 /*
 ** {======================================================================
 ** This is an implementation of loadlib for Windows using native functions.
@@ -93,7 +93,7 @@ static void pusherror (lua_State *L) {
   char buffer[128];
   if (FormatMessage(FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_FROM_SYSTEM,
       NULL, error, 0, buffer, sizeof(buffer), NULL))
-    lua_pushstring(L,buffer);
+    lua_pushstring(L, buffer);
   else
     lua_pushfstring(L, "system error %d\n", error);
 }
@@ -120,7 +120,7 @@ static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) {
 
 
 
-#elif defined(LUA_USE_DYLD)
+#elif defined(LUA_DL_DYLD)
 /*
 ** {======================================================================
 ** Native Mac OS X / Darwin Implementation
@@ -212,6 +212,13 @@ static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) {
 #define LIB_FAIL        "absent"
 
 
+#if defined(__ELF__) || defined(__sun) || defined(sgi) || defined(__hpux)
+#define DLMSG           "your system was not properly installed, " \
+                        "so it cannot run `loadlib'; check your installation"
+#else
+#define DLMSG           "`loadlib' not supported"
+#endif
+
 static void ll_unloadlib (void *lib) {
   (void)lib;  /* to avoid warnings */
 }
@@ -219,14 +226,14 @@ static void ll_unloadlib (void *lib) {
 
 static void *ll_load (lua_State *L, const char *path) {
   (void)path;  /* to avoid warnings */
-  lua_pushliteral(L,"`loadlib' not supported");
+  lua_pushliteral(L, DLMSG);
   return NULL;
 }
 
 
 static lua_CFunction ll_sym (lua_State *L, void *lib, const char *sym) {
   (void)lib; (void)sym;  /* to avoid warnings */
-  lua_pushliteral(L,"`loadlib' not supported");
+  lua_pushliteral(L, DLMSG);
   return NULL;
 }
 
diff --git a/luaconf.h b/luaconf.h
index fe26dc2b..2a9a22fc 100644
--- a/luaconf.h
+++ b/luaconf.h
@@ -1,5 +1,5 @@
 /*
-** $Id: luaconf.h,v 1.37 2005/03/18 18:55:45 roberto Exp roberto $
+** $Id: luaconf.h,v 1.38 2005/03/21 18:12:07 roberto Exp roberto $
 ** Configuration file for Lua
 ** See Copyright Notice in lua.h
 */
@@ -24,10 +24,10 @@
 
 
 /*
-*@ LUA_PATH_DEFAULT is the default path that Lua uses to look for
-** Lua libraries.
-*@ LUA_CPATH_DEFAULT is the default path that Lua uses to look for
-** C libraries.
+@@ LUA_PATH_DEFAULT is the default path that Lua uses to look for
+@* Lua libraries.
+@@ LUA_CPATH_DEFAULT is the default path that Lua uses to look for
+@* C libraries.
 ** CHANGE them if your machine has a non-conventional directory
 ** hierarchy or if you want to install your libraries in
 ** non-conventional directories.
@@ -53,7 +53,7 @@
 
 
 /*
-*@ LUA_DIRSEP is the directory separator (for submodules).
+@@ LUA_DIRSEP is the directory separator (for submodules).
 ** CHANGE it if your machine does not use "/" as the directory separator
 ** and is not Windows. (On Windows Lua automatically uses "\".)
 */
@@ -65,7 +65,7 @@
 
 
 /*
-*@ LUA_PATHSEP is the character that separates templates in a path.
+@@ LUA_PATHSEP is the character that separates templates in a path.
 ** CHANGE it if for some reason your system cannot use a
 ** semicolon. (E.g., a semicolon may be a too common character in
 ** file/directory names.) Probably you do not need to change this.
@@ -74,8 +74,8 @@
 
 
 /*
-*@ LUA_PATH_MARK is ths string that marks the substitution points in a
-** template.
+@@ LUA_PATH_MARK is ths string that marks the substitution points in a
+@* template.
 ** CHANGE it if for some reason your system cannot use an interogation
 ** mark.  (E.g., an interogation mark may be a too common character in
 ** file/directory names.) Probably you do not need to change this.
@@ -84,7 +84,7 @@
 
 
 /*
-*@ LUA_INTEGER is the integral type used by lua_pushinteger/lua_tointeger.
+@@ LUA_INTEGER is the integral type used by lua_pushinteger/lua_tointeger.
 ** CHANGE that if ptrdiff_t is not adequate on your machine. (On most
 ** machines, ptrdiff_t gives a good choice between int or long.)
 */
@@ -92,30 +92,36 @@
 
 
 /*
-*@ LUA_API is a mark for all core API functions.
-*@ LUALIB_API is a mark for all standard library functions.
+@@ LUA_API is a mark for all core API functions.
+@@ LUALIB_API is a mark for all standard library functions.
 ** CHANGE them if you need to define those functions in some special way.
 ** For instance, if you want to create two Windows DLLs, one with the
 ** core, the other with the libraries, you may want to use the following
-** definition:
-**
-**      #ifdef LUA_CORE
-**      #define LUA_API __declspec(__dllexport)
-**      #else
-**      #define LUA_API __declspec(__dllimport)
-**      #endif
-**      #ifdef LUA_LIB
-**      #define LUALIB_API __declspec(__dllexport)
-**      #else
-**      #define LUALIB_API __declspec(__dllimport)
-**      #endif
+** definition (define LUA_BUILD_AS_DLL to get it).
 */
+#if defined (LUA_BUILD_AS_DLL)
+
+#if defined(LUA_CORE)
+#define LUA_API __declspec(__dllexport)
+#else
+#define LUA_API __declspec(__dllimport)
+#endif
+#if defined(LUA_LIB)
+#define LUALIB_API __declspec(__dllexport)
+#else
+#define LUALIB_API __declspec(__dllimport)
+#endif
+
+#else
+
 #define LUA_API         extern
 #define LUALIB_API      extern
 
+#endif
+
 
 /*
-*@ lua_assert describes the internal assertions in Lua.
+@@ lua_assert describes the internal assertions in Lua.
 ** CHANGE that only if you need to debug Lua.
 */
 #define lua_assert(c)           ((void)0)
@@ -128,13 +134,18 @@
 ** ===================================================================
 */
 
-#ifdef lua_c
+#if defined(lua_c) || defined(luaall_c)
 
-/* CONFIG: definition of isatty */
-#ifdef _POSIX_C_SOURCE
+/*
+@@ lua_stdin_is_tty is a function to detect whether the standard input is
+@* a `tty' (that is, is interactive).
+** CHANGE it if you have a better definition for non-POSIX/non-Windows
+** systems.
+*/
+#if !defined(__STRICT_ANSI__) && defined(_POSIX_C_SOURCE)
 #include <unistd.h>
 #define lua_stdin_is_tty()      isatty(0)
-#elif defined(_WIN32)
+#elif !defined(__STRICT_ANSI__) && defined(_WIN32)
 #include <io.h>
 #include <stdio.h>
 #define lua_stdin_is_tty()      _isatty(_fileno(stdin))
@@ -143,47 +154,81 @@
 #endif
 
 
+/*
+@@ LUA_PROMPT is the default prompt used by stand-alone Lua.
+@@ LUA_PROMPT2 is the default continuation prompt used by stand-alone Lua.
+** CHANGE them if you want different prompts. (You can also change the
+** prompts dynamically, assigning to globals _PROMPT/_PROMPT2.)
+*/
 #define LUA_PROMPT              "> "
 #define LUA_PROMPT2             ">> "
+
+
+/*
+@@ LUA_PROGNAME is the default name for the stand-alone Lua program.
+** CHANGE it if your stand-alone interpreter has a different name and
+** your system is not able to detect that name automatically.
+*/
 #define LUA_PROGNAME            "lua"
 
+
 /*
-*@ LUA_MAXINPUT is the maximum length for an input line
+@@ LUA_MAXINPUT is the maximum length for an input line
 ** CHANGE it if you need longer lines.
 */
 #define LUA_MAXINPUT    512
 
 
 /*
-*@ lua_readline defines how to show a prompt and then read a line from
-** the standard input.
-*@ lua_saveline defines how to "save" a read line.
+@@ lua_readline defines how to show a prompt and then read a line from
+@* the standard input.
+@@ lua_saveline defines how to "save" a read line.
+@@ lua_freeline defines how to free a line read by lua_readline.
 ** CHANGE them if you want to improve this functionality (e.g., using GNU
-** readline and history facilities). (Lua already tries to use those
-** facilities when it detects a GNU compiler.)
+** readline and history facilities).
 */
-#ifdef __GNUC__
+#if !defined(__STRICT_ANSI__) && defined(LUA_USE_READLINE)
+#include <stdio.h>
 #include <readline/readline.h>
 #include <readline/history.h>
 #define lua_readline(L,b,p)     (((b)=readline(p)) != NULL)
 #define lua_saveline(L,idx) \
         if (lua_strlen(L,idx) > 0)  /* non-empty line? */ \
           add_history(lua_tostring(L, idx));  /* add it to history */
+#define lua_freeline(L,b)       free(b)
 #else
 #define lua_readline(L,b,p)     \
         (fputs(p, stdout), fflush(stdout),  /* show prompt */ \
         fgets(b, LUA_MAXINPUT, stdin) != NULL)  /* get line */
 #define lua_saveline(L,idx)     ((void)0)
+#define lua_freeline(L,b)       ((void)0)
 #endif
 
-
-
 #endif
 
 /* }================================================================== */
 
 
 /*
+@@ LUAI_GCPAUSE defines the default pause between garbage-collector cycles
+@* as a percentage.
+** CHANGE it if you want the GC to run faster or slower (higher
+** values mean larger pauses which mean slower collection.)
+*/
+#define LUAI_GCPAUSE    200  /* 200% (wait memory to double before next GC) */
+
+
+/*
+@@ LUAI_GCMUL defines the speed of garbage collection relative to
+@* memory allocation as a percentage.
+** CHANGE it if you want to change the granularity of the garbage
+** collection. (Higher values mean coarser collections. 0 represents
+** infinity, where each step performs a full collection.)
+*/
+#define LUAI_GCMUL      200 /* GC runs `twice the speed' of memory allocation */
+
+
+/*
 ** CHANGE here (undefining both luaL_getn and luaL_setn) if you want
 ** exact compatibility with the behavior of setn/getn in Lua 5.0.
 */
@@ -192,23 +237,25 @@
 
 
 /*
+@@ luai_apicheck is the assert macro used by the Lua-C API.
 ** CHANGE luai_apicheck if you want Lua to perform some checks in the
 ** parameters it gets from API calls. This may slow down the interpreter
 ** a bit, but may be quite useful when debugging C code that interfaces
-** with Lua. A useful redefinition may be like this:
-**
-**      #include <assert.h>
-**      #define luai_apicheck(L,o) assert(o)
-**
-** (By default lua_assert is empty, so luai_apicheck is also empty.)
+** with Lua. A useful redefinition is to use assert.h.
 */
+#if defined(LUA_USE_APICHECK)
+#include <assert.h>
+#define luai_apicheck(L,o) assert(o)
+#else
+/* (By default lua_assert is empty, so luai_apicheck is also empty.) */
 #define luai_apicheck(L,o)              lua_assert(o)
+#endif
 
 
 /*
+@@ LUAI_BITSINT defines the number of bits in an int.
 ** CHANGE here if Lua cannot automatically detect the number of bits of
-** your machine. (In that case, simply define LUA_BITSINT.) Probably you
-** do not need to change this.
+** your machine. Probably you do not need to change this.
 */
 /* avoid overflows in comparison */
 #if INT_MAX-20 < 32760
@@ -222,16 +269,16 @@
 
 
 /*
-*@ LUAI_UINT32 is an unsigned integer with at least 32 bits.
-*@ LUAI_INT32 is an signed integer with at least 32 bits.
-*@ LUAI_UMEM is an an unsigned integer big enough to count the total
-** memory used by Lua.
-*@ LUAI_MEM is an a signed integer big enough to count the total memory
-** used by Lua.
+@@ LUAI_UINT32 is an unsigned integer with at least 32 bits.
+@@ LUAI_INT32 is an signed integer with at least 32 bits.
+@@ LUAI_UMEM is an an unsigned integer big enough to count the total
+@* memory used by Lua.
+@@ LUAI_MEM is an a signed integer big enough to count the total memory
+@* used by Lua.
 ** CHANGE here if for some weird reason the default definitions are not
-** good enough for your machine. The `else' definition always works, but
-** may waste space on machines with 64-bit longs. Probably you do not
-** need to change this.
+** good enough for your machine. (The `else' definition always works,
+** but may waste space on machines with 64-bit longs.) Probably you do
+** not need to change this.
 */
 #if LUAI_BITSINT >= 32
 #define LUAI_UINT32     unsigned int
@@ -250,7 +297,7 @@
 
 
 /*
-*@ LUAI_MAXCALLS limits the number of nested calls.
+@@ LUAI_MAXCALLS limits the number of nested calls.
 ** CHANGE it if you need really deep recursive calls. This limit is
 ** arbitrary; its only purpose is to stop infinite recursion before
 ** exhausting memory.
@@ -259,7 +306,7 @@
 
 
 /*
-*@ LUAI_MAXCSTACK limits the number of slots that a C function can use.
+@@ LUAI_MAXCSTACK limits the number of slots that a C function can use.
 ** CHANGE it if you need lots of (Lua) stack space for your C
 ** functions. This limit is arbitrary; its only purpose is to stop C
 ** functions to consume unlimited stack space.
@@ -283,41 +330,41 @@
 
 
 /*
-*@ LUAI_MAXCCALLS is the maximum depth for nested C calls (unsigned short).
+@@ LUAI_MAXCCALLS is the maximum depth for nested C calls (short).
 */
 #define LUAI_MAXCCALLS  200
 
 
 /*
-*@ LUAI_MAXPARSERLEVEL is the maximum number of syntactical nested
-** non-terminals in a program.
+@@ LUAI_MAXPARSERLEVEL is the maximum number of syntactical nested
+@* non-terminals in a program.
 */
 #define LUAI_MAXPARSERLEVEL     200
 
 
 /*
-*@ LUAI_MAXVARS is the maximum number of local variables per function
-** (must be smaller than 250).
+@@ LUAI_MAXVARS is the maximum number of local variables per function
+@* (must be smaller than 250).
 */
 #define LUAI_MAXVARS            200
 
 
 /*
-*@ LUAI_MAXUPVALUES is the maximum number of upvalues per function
-** (must be smaller than 250).
+@@ LUAI_MAXUPVALUES is the maximum number of upvalues per function
+@* (must be smaller than 250).
 */
 #define LUAI_MAXUPVALUES        60
 
 
 /*
-*@ LUAI_MAXEXPWHILE is the maximum size of code for expressions
-** controling a `while' loop.
+@@ LUAI_MAXEXPWHILE is the maximum size of code for expressions
+@* controling a `while' loop.
 */
 #define LUAI_MAXEXPWHILE        100
 
 
 /*
-*@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system.
+@@ LUAL_BUFFERSIZE is the buffer size used by the lauxlib buffer system.
 */
 #define LUAL_BUFFERSIZE         BUFSIZ
 
@@ -326,19 +373,19 @@
 
 
 /*
-*@ lua_number2int is a macro to convert lua_Number to int.
+@@ lua_number2int is a macro to convert lua_Number to int.
 ** CHANGE that if you know a faster way to convert a lua_Number to
 ** int (with any rounding method and without throwing errors) in your
-** system. In Pentium machines, a naive typecast from doulbe to int
+** system. In Pentium machines, a naive typecast from double to int
 ** in C is extremely slow, so any alternative is worth trying.
 */
 
 /* On a GNU/Pentium, resort to assembler */
-#if defined(__GNUC__) && defined(__i386)
+#if !defined(__STRICT_ANSI__) && defined(__GNUC__) && defined(__i386)
 #define lua_number2int(i,d)     __asm__ ("fistpl %0":"=m"(i):"t"(d):"st")
 
 /* On  Windows/Pentium, resort to assembler */
-#elif defined(_MSC_VER) && defined(_M_IX86)
+#elif !defined(__STRICT_ANSI__) && defined(_MSC_VER) && defined(_M_IX86)
 #pragma warning(disable: 4514)
 __inline int l_lrint (double flt)
 {     int i;
@@ -351,7 +398,8 @@ __inline int l_lrint (double flt)
 #define lua_number2int(i,d)   ((i)=l_lrint((d)))
 
 /* on Pentium machines compliant with C99, you can try lrint */
-#elif defined (__i386) && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199900L)
+#elif defined (__i386) && defined(__STDC_VERSION__) && \
+                                 (__STDC_VERSION__ >= 199900L)
 #define lua_number2int(i,d)     ((i)=lrint(d))
 
 /* this option always work, but may be slow */
@@ -362,7 +410,7 @@ __inline int l_lrint (double flt)
 
 
 /*
-*@ lua_number2integer is a macro to convert lua_Number to lua_Integer.
+@@ lua_number2integer is a macro to convert lua_Number to lua_Integer.
 ** CHANGE (see lua_number2int).
 */
 /* On a GNU or Windows/Pentium, resort to assembler */
@@ -388,20 +436,20 @@ __inline int l_lrint (double flt)
 
 
 /*
-*@ LUA_NUMBER is the type of numbers in Lua.
-*@ LUAI_UACNUMBER is the result of an `usual argument conversion'
-** over a number.
+@@ LUA_NUMBER is the type of numbers in Lua.
+@@ LUAI_UACNUMBER is the result of an `usual argument conversion'
+@* over a number.
 */
 #define LUA_NUMBER      double
 #define LUAI_UACNUMBER  LUA_NUMBER
 
 
 /*
-*@ LUA_NUMBER_SCAN is the format for reading numbers.
-*@ LUA_NUMBER_FMT is the format for writing numbers.
-*@ lua_number2str converts a number to a string.
-*@ LUAI_MAXNUMBER2STR is maximum size of previous conversion.
-*@ lua_str2number converts a string to a number.
+@@ LUA_NUMBER_SCAN is the format for reading numbers.
+@@ LUA_NUMBER_FMT is the format for writing numbers.
+@@ lua_number2str converts a number to a string.
+@@ LUAI_MAXNUMBER2STR is maximum size of previous conversion.
+@@ lua_str2number converts a string to a number.
 */
 #define LUA_NUMBER_SCAN         "%lf"
 #define LUA_NUMBER_FMT          "%.14g"
@@ -411,7 +459,7 @@ __inline int l_lrint (double flt)
 
 
 /*
-*@ The luai_num* macros define the primitive operations over numbers.
+@@ The luai_num* macros define the primitive operations over numbers.
 */
 #define luai_numadd(a,b)        ((a)+(b))
 #define luai_numsub(a,b)        ((a)-(b))
@@ -428,7 +476,7 @@ __inline int l_lrint (double flt)
 
 
 /*
-*@ LUAI_USER_ALIGNMENT_T is a type that requires maximum alignment.
+@@ LUAI_USER_ALIGNMENT_T is a type that requires maximum alignment.
 ** CHANGE it if your system requires alignments larger than double. (For
 ** instance, if your system supports long double and those long doubles
 ** must be aligned in 16-byte boundaries, then you should add long
@@ -438,43 +486,55 @@ __inline int l_lrint (double flt)
 
 
 /*
-*@ LUAI_THROW/LUAI_TRY define how Lua does exception handling.
-** CHANGE them if you prefer to use longjmp/setjmp even with C++.  By
-** default, Lua handles errors with longjmp/setjmp when compiling as C
-** code and with exceptions when compiling as C++ code.
+@@ LUAI_THROW/LUAI_TRY define how Lua does exception handling.
+** CHANGE them if you prefer to use longjmp/setjmp even with C++ or
+** if want/don't want to use _longjmp/_setjmp instead of regular
+** longjmp/setjmp. By default, Lua handles errors with exceptions when
+** compiling as C++ code, with _longjmp/_setjmp when compiling as C code
+** in a Unix system, and with longjmp/setjmp otherwise.
 */
-#ifndef __cplusplus
-/* default handling with long jumps */
-#define LUAI_THROW(L,c) longjmp((c)->b, 1)
-#define LUAI_TRY(L,c,a) if (setjmp((c)->b) == 0) { a }
-#define luai_jmpbuf     jmp_buf
-
-#else
+#if defined(__cplusplus)
 /* C++ exceptions */
 #define LUAI_THROW(L,c) throw(c)
 #define LUAI_TRY(L,c,a) try { a } catch(...) \
         { if ((c)->status == 0) (c)->status = -1; }
 #define luai_jmpbuf     int  /* dummy variable */
+
+#elif !defined(__STRICT_ANSI__) && (defined(unix) || defined(__unix) || \
+                                    defined(__unix__))
+/* in Unix, try _longjmp/_setjmp (more efficient) */
+#define LUAI_THROW(L,c) _longjmp((c)->b, 1)
+#define LUAI_TRY(L,c,a) if (_setjmp((c)->b) == 0) { a }
+#define luai_jmpbuf     jmp_buf
+
+#else
+/* default handling with long jumps */
+#define LUAI_THROW(L,c) longjmp((c)->b, 1)
+#define LUAI_TRY(L,c,a) if (setjmp((c)->b) == 0) { a }
+#define luai_jmpbuf     jmp_buf
+
 #endif
 
 
 /*
-*@ LUA_MAXCAPTURES is the maximum number of captures that a pattern
-** can do during pattern-matching.
+@@ LUA_MAXCAPTURES is the maximum number of captures that a pattern
+@* can do during pattern-matching.
 ** CHANGE it if you need more captures. This limit is arbitrary.
 */
 #define LUA_MAXCAPTURES         32
 
 
 /*
-*@ lua_tmpnam is the function that the OS library uses to create a
-** temporary name.
-** CHANGE it if you have an alternative to tmpnam (which is considered
-** insecure) or if you want the original tmpnam anyway.  By default,
-** Lua uses tmpnam except when compiled when POSIX is available, where
-** it uses mkstemp.
+@@ lua_tmpnam is the function that the OS library uses to create a
+@* temporary name.
+@@ LUA_TMPNAMBUFSIZE is the maximum size of a name created by lua_tmpnam.
+** CHANGE them if you have an alternative to tmpnam (which is considered
+** insecure) or if you want the original tmpnam anyway.  By default, Lua
+** uses tmpnam except when POSIX is available, where it uses mkstemp.
 */
-#ifdef _POSIX_C_SOURCE
+#if defined(loslib_c) || defined(luaall_c)
+
+#if !defined(__STRICT_ANSI__) && defined(_POSIX_C_SOURCE)
 #include <unistd.h>
 #define LUA_TMPNAMBUFSIZE       32
 #define lua_tmpnam(b,e) { \
@@ -487,29 +547,36 @@ __inline int l_lrint (double flt)
 #define lua_tmpnam(b,e)         { e = (tmpnam(b) == NULL); }
 #endif
 
+#endif
 
 /*
-*@ LUA_USE_* define which dynamic-library system Lua should use.
+@@ LUA_DL_* define which dynamic-library system Lua should use.
 ** CHANGE here if Lua has problems choosing the appropriate
 ** dynamic-library system for your platform (either Windows' DLL, Mac's
 ** dyld, or Unix's dlopen). If your system is some kind of Unix, there
-** is a good chance that LUA_USE_DLOPEN will work for it. (You may need
-** to adapt also the makefile.) If you do not want any kind of dynamic
-** library, undefine all these options (or just remove these definitions).
-*/
+** is a good chance that it has dlopen, so LUA_DL_DLOPEN will work for
+** it.  To use dlopen you also need to adapt the makefile (probably
+** adding -ldl to the linker options), so Lua does not select it
+** automatically.  (When you change the makefile to add -ldl, you must
+** also add -DLUA_USE_DLOPEN.)
+** If you do not want any kind of dynamic library, undefine all these
+** options (or just remove these definitions).
+*/
+#if !defined(__STRICT_ANSI__) 
 #if defined(_WIN32)
-#define LUA_USE_DLL
+#define LUA_DL_DLL
 #elif defined(__APPLE__) && defined(__MACH__)
-#define LUA_USE_DYLD
-#elif defined(__linux) || defined(sun) || defined(sgi) || defined(BSD)
-#define LUA_USE_DLOPEN
+#define LUA_DL_DYLD
+#elif defined(LUA_USE_DLOPEN)
+#define LUA_DL_DLOPEN
+#endif
 #endif
 
 
 /*
-*@ lua_lock/lua_unlock are macros for thread synchronization inside the
-** Lua core. This is an attempt to simplify the implementation of a
-** multithreaded version of Lua.
+@@ lua_lock/lua_unlock are macros for thread synchronization inside the
+@* Lua core. This is an attempt to simplify the implementation of a
+@* multithreaded version of Lua.
 ** CHANGE them only if you know what you are doing. all accesses to
 ** the global state and to global objects are synchronized.  Because
 ** threads can read the stack of other threads (when running garbage
@@ -523,15 +590,15 @@ __inline int l_lrint (double flt)
 
 
 /*
-*@ lua_threadyield allows a thread switch in appropriate places in the core.
+@@ lua_threadyield allows a thread switch in appropriate places in the core.
 ** CHANGE it only if you know what you are doing. (See lua_lock.)
 */
 #define luai_threadyield(L)     {lua_unlock(L); lua_lock(L);}
 
 
 /*
-*@ LUAI_EXTRASPACE allows you to add user-specific data in a lua_State
-** (the data goes just *before* the lua_State pointer).
+@@ LUAI_EXTRASPACE allows you to add user-specific data in a lua_State
+@* (the data goes just *before* the lua_State pointer).
 ** CHANGE (define) this if you really need that. This value must be
 ** a multiple of the maximum alignment required for your machine.
 */
@@ -539,7 +606,7 @@ __inline int l_lrint (double flt)
 
 
 /*
-*@ luai_userstateopen allows user-specific initialization on new threads.
+@@ luai_userstateopen allows user-specific initialization on new threads.
 ** CHANGE it if you defined LUAI_EXTRASPACE and need to initialize that
 ** data whenever a new lua_State is created.
 */