Merge branch 'jwt27'

Conflicts:
	src/djasm/djasm.y
	src/libemu/makefile
	src/stub/exe2coff.c
	src/stub/makefile

Author: stsp

include/stdint.h

@@ -145,7 +145,7 @@ __extension__ typedef unsigned long long int uintmax_t;
 
 #endif /* (__STDC_VERSION__ >= 199901L) || !__STRICT_ANSI__ */
 
-#ifndef __dj_ENFORCE_ANSI_FREESTANDIGN
+#ifndef __dj_ENFORCE_ANSI_FREESTANDING
 
 #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) \
   || !defined(__STRICT_ANSI__) || defined(__cplusplus)

src/libc/compat/ioctl/ioctl.c

@@ -337,8 +337,17 @@ int ioctl(int fd, int cmd, ...)
    ** see if this is a file system extension file
    **
    */
-  if (func && __FSEXT_func_wrapper(func, __FSEXT_ioctl, &rv, fd))
-    return rv;
+  if (func)
+  {
+    char *arg;
+
+    va_start(args, cmd);
+    arg = va_arg(args, char *);
+    va_end(args);
+
+    if (__FSEXT_func_wrapper(func, __FSEXT_ioctl, &rv, fd, cmd, arg))
+      return rv;
+  }
 
   va_start(args, cmd);
 

src/libc/posix/fcntl/fcntl.c

@@ -281,8 +281,13 @@ fcntl(int fd, int cmd, ...)
   func = __FSEXT_get_function(fd);
   if (func)
   {
-    int rv;
-    if (__FSEXT_func_wrapper(func, __FSEXT_fcntl, &rv, fd, cmd))
+    int rv, arg;
+
+    va_start(ap, cmd);
+    arg = va_arg(ap, int);
+    va_end(ap);
+
+    if (__FSEXT_func_wrapper(func, __FSEXT_fcntl, &rv, fd, cmd, arg))
       return rv;
   }