Merge branch 'incoming'

1 files changed, 36 insertions, 4 deletions

diff --git a/src/settings.js b/src/settings.js
index 02423ba5..79c54c2b 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -354,9 +354,10 @@ var LINKABLE = 0; // If set to 1, this file can be linked with others, either as
                   // LINKABLE of 0 is very useful in that we can reduce the size of the
                   // generated code very significantly, by removing everything not actually used.
 
-var DLOPEN_SUPPORT = 0; // Whether to support dlopen(NULL, ...) which enables dynamic access to the
-                        // module's functions and globals. Implies LINKABLE=1, because we do not want
-                        // dead code elimination.
+var DLOPEN_SUPPORT = 0; // Full support for dlopen. This is necessary for asm.js and for all code
+                        // modes for dlopen(NULL, ...). Note that you must use EMSCRIPTEN_KEEPALIVE
+                        // to ensure that functions and globals can be accessed through dlsym,
+                        // otherwise LLVM may optimize them out.
 
 var RUNTIME_TYPE_INFO = 0; // Whether to expose type info to the script at run time. This
                            // increases the size of the generated script, but allows you
@@ -457,6 +458,7 @@ var C_DEFINES = {
    'ABMON_8': '40',
    'ABMON_9': '41',
    'ACCESSPERMS': '0000400',
+   'AF_UNSPEC': '0',
    'AF_INET': '2',
    'AF_INET6': '10',
    'ALLPERMS': '0004000',
@@ -718,6 +720,7 @@ var C_DEFINES = {
    'PM_STR': '6',
    'POLLERR': '8',
    'POLLHUP': '16',
+   'POLLPRI': '32',
    'POLLIN': '1',
    'POLLNVAL': '4',
    'POLLOUT': '2',
@@ -1457,6 +1460,35 @@ var C_DEFINES = {
    'ECANCELED': '140',
    'ENOTRECOVERABLE': '141',
    'EOWNERDEAD': '142',
-   'ESTRPIPE': '143'
+   'ESTRPIPE': '143',
+   'AI_PASSIVE': '0x0001',
+   'AI_CANONNAME': '0x0002',
+   'AI_NUMERICHOST': '0x0004',
+   'AI_V4MAPPED': '0x0008',
+   'AI_ALL': '0x0010',
+   'AI_ADDRCONFIG': '0x0020',
+   'AI_NUMERICSERV': '0x0400',
+   'EAI_ADDRFAMILY': '1',
+   'EAI_AGAIN': '2',
+   'EAI_BADFLAGS': '3',
+   'EAI_FAIL': '4',
+   'EAI_FAMILY': '5',
+   'EAI_MEMORY': '6',
+   'EAI_NODATA': '7',
+   'EAI_NONAME': '8',
+   'EAI_SERVICE': '9',
+   'EAI_SOCKTYPE': '10',
+   'EAI_SYSTEM': '11',
+   'EAI_BADHINTS': '12',
+   'EAI_PROTOCOL': '13',
+   'EAI_OVERFLOW': '14',
+   'EAI_MAX': '15',
+   'NI_NOFQDN': '0x00000001',
+   'NI_NUMERICHOST': '0x00000002',
+   'NI_NAMEREQD': '0x00000004',
+   'NI_NUMERICSERV': '0x00000008',
+   'NI_DGRAM': '0x00000010',
+   'INADDR_ANY': '0',
+   'INADDR_LOOPBACK': '0x7f000001'
 };