Better support for configure detection of missing types, added check

configure

@@ -5099,150 +5099,6 @@ _ACEOF
 fi
 
 
-UTILLIBS=""
-
-
-for ac_func in openpty
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  echo "$as_me:$LINENO: checking for openpty in -lutil" >&5
-echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
-if test "${ac_cv_lib_util_openpty+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lutil  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char openpty ();
-#ifdef F77_DUMMY_MAIN
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-#endif
-int
-main ()
-{
-openpty ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_util_openpty=yes
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-ac_cv_lib_util_openpty=no
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_util_openpty" >&5
-echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
-if test $ac_cv_lib_util_openpty = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_OPENPTY 1
-_ACEOF
-
-		UTILLIBS="-lutil"
-
-fi
-
-fi
-done
-
-
 DLLIBS=""
 
 echo "$as_me:$LINENO: checking for ANSI C header files" >&5
@@ -10431,7 +10287,6 @@ fi
 
 
 
-
 for ac_func in \
 	__libc_fork \
 	_lwp_create \
@@ -10449,7 +10304,6 @@ for ac_func in \
 	getpagesize \
 	getprotobyname \
 	getprotobynumber \
-	getrlimit \
 	getservbyport \
 	getsockopt \
 	inet_network \
@@ -11139,15 +10993,13 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
 echo "${ECHO_T}$ac_cv_type_mode_t" >&6
 if test $ac_cv_type_mode_t = yes; then
-  :
-else
 
 cat >>confdefs.h <<_ACEOF
-#define mode_t int
+#define HAVE_MODE_T 1
 _ACEOF
 
-fi
 
+fi
 echo "$as_me:$LINENO: checking for off_t" >&5
 echo $ECHO_N "checking for off_t... $ECHO_C" >&6
 if test "${ac_cv_type_off_t+set}" = set; then
@@ -11197,15 +11049,13 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 if test $ac_cv_type_off_t = yes; then
-  :
-else
 
 cat >>confdefs.h <<_ACEOF
-#define off_t long
+#define HAVE_OFF_T 1
 _ACEOF
 
-fi
 
+fi
 echo "$as_me:$LINENO: checking for pid_t" >&5
 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
 if test "${ac_cv_type_pid_t+set}" = set; then
@@ -11255,15 +11105,13 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
 echo "${ECHO_T}$ac_cv_type_pid_t" >&6
 if test $ac_cv_type_pid_t = yes; then
-  :
-else
 
 cat >>confdefs.h <<_ACEOF
-#define pid_t int
+#define HAVE_PID_T 1
 _ACEOF
 
-fi
 
+fi
 echo "$as_me:$LINENO: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
@@ -11313,13 +11161,68 @@ fi
 echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 if test $ac_cv_type_size_t = yes; then
-  :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SIZE_T 1
+_ACEOF
+
+
+fi
+echo "$as_me:$LINENO: checking for ssize_t" >&5
+echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
+if test "${ac_cv_type_ssize_t+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+$ac_includes_default
+#ifdef F77_DUMMY_MAIN
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+#endif
+int
+main ()
+{
+if ((ssize_t *) 0)
+  return 0;
+if (sizeof (ssize_t))
+  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_type_ssize_t=yes
 else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+ac_cv_type_ssize_t=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
+echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
+if test $ac_cv_type_ssize_t = yes; then
 
 cat >>confdefs.h <<_ACEOF
-#define size_t unsigned
+#define HAVE_SSIZE_T 1
 _ACEOF
 
+
 fi
 
 echo "$as_me:$LINENO: checking for long long" >&5
@@ -13261,7 +13164,6 @@ s,@LDCONFIG@,$LDCONFIG,;t t
 s,@LINT@,$LINT,;t t
 s,@LINTFLAGS@,$LINTFLAGS,;t t
 s,@LDCOMBINE@,$LDCOMBINE,;t t
-s,@UTILLIBS@,$UTILLIBS,;t t
 s,@DLLIBS@,$DLLIBS,;t t
 s,@JPEGLIB@,$JPEGLIB,;t t
 s,@XLIB@,$XLIB,;t t

configure.ac

@@ -95,15 +95,6 @@ AC_CHECK_LIB(xpg4,_xpg4_setrunelocale)
 dnl Check for -lmmap for OS/2
 AC_CHECK_LIB(mmap,mmap)
 
-dnl Check for openpty
-UTILLIBS=""
-AC_SUBST(UTILLIBS)
-AC_CHECK_FUNCS(openpty,,
-	[AC_CHECK_LIB(util,openpty,
-		[AC_DEFINE(HAVE_OPENPTY)
-		UTILLIBS="-lutil"]
-	)])
-
 DLLIBS=""
 AC_SUBST(DLLIBS)
 AC_CHECK_HEADERS(dlfcn.h,
@@ -880,7 +871,6 @@ AC_CHECK_FUNCS(\
 	getpagesize \
 	getprotobyname \
 	getprotobynumber \
-	getrlimit \
 	getservbyport \
 	getsockopt \
 	inet_network \
@@ -978,10 +968,7 @@ dnl **** Check for types ****
 
 AC_C_CONST
 AC_C_INLINE
-AC_TYPE_MODE_T
-AC_TYPE_OFF_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
+AC_CHECK_TYPES([mode_t, off_t, pid_t, size_t, ssize_t])
 AC_CHECK_SIZEOF(long long,0)
 
 AC_CACHE_CHECK([whether linux/input.h is for real],

debugger/ext_debugger.c

@@ -18,6 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
 
 #include <unistd.h>
 #include <errno.h>

debugger/memory.c

@@ -21,6 +21,8 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
+
 #include <stdlib.h>
 #include <string.h>
 

dlls/advapi32/advapi.c

@@ -18,6 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <errno.h>
 #include <stdio.h>
 #include <unistd.h>

dlls/ddraw/ddraw/main.c

@@ -26,6 +26,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <assert.h>
 #include <string.h>

dlls/ddraw/helper.c

@@ -21,6 +21,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <stddef.h>
 

dlls/dsound/dsound_main.c

@@ -38,6 +38,8 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <sys/types.h>

dlls/msvcrt/data.c

@@ -17,6 +17,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
+#include "config.h"
+#include "wine/port.h"
+
 #include <math.h>
 #include "msvcrt.h"
 

dlls/msvcrt/dir.c

@@ -21,6 +21,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <time.h>
 #include "ntddk.h"
 #include "wine/unicode.h"

dlls/msvcrt/file.c

@@ -20,6 +20,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
+#include "config.h"
+#include "wine/port.h"
+
 #include <time.h>
 #include <stdio.h>
 #include <unistd.h>

dlls/msvcrt/locale.c

@@ -17,6 +17,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
+#include "config.h"
+#include "wine/port.h"
+
 #include "winnt.h"
 #include "winbase.h"
 #include "winuser.h"

dlls/ntdll/reg.c

@@ -25,6 +25,9 @@
   *	HKEY_CLASSES		\\REGISTRY\\MACHINE\\SOFTWARE\\CLASSES
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <string.h>
 #include "wine/debug.h"
 #include "winreg.h"

dlls/odbc32/proxyodbc.c

@@ -32,6 +32,7 @@
 
 #include "winbase.h"
 #include "wine/debug.h"
+#include "wine/library.h"
 
 #include "sql.h"
 #include "sqltypes.h"

dlls/quartz/iunk.c

@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include "windef.h"
 #include "winerror.h"

dlls/setupapi/parser.c

@@ -18,6 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <assert.h>
 #include <limits.h>
 #include <string.h>

dlls/shdocvw/comimpl.c

@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include "windef.h"
 #include "winerror.h"

dlls/urlmon/comimpl.c

@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include "windef.h"
 #include "winerror.h"

dlls/user/dde/misc.c

@@ -24,6 +24,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <string.h>
 #include <stdio.h>
 #include "winbase.h"

dlls/user/message.c

@@ -18,6 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"

dlls/user/text.c

@@ -24,6 +24,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <string.h>
 #include <assert.h>
 

dlls/winedos/module.c

@@ -21,6 +21,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <stdio.h>
 #include <stdlib.h>

dlls/wininet/ftp.c

@@ -24,6 +24,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <errno.h>
 #include <stdio.h>

graphics/x11drv/xfont.c

@@ -22,6 +22,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <X11/Xatom.h>
 

include/config.h.in

@@ -125,9 +125,6 @@
 /* Define to 1 if you have the `getprotobynumber' function. */
 #undef HAVE_GETPROTOBYNUMBER
 
-/* Define to 1 if you have the `getrlimit' function. */
-#undef HAVE_GETRLIMIT
-
 /* Define to 1 if you have the `getservbyport' function. */
 #undef HAVE_GETSERVBYPORT
 
@@ -275,6 +272,9 @@
 /* Define to 1 if you have the `mmap' function. */
 #undef HAVE_MMAP
 
+/* Define to 1 if the system has the type `mode_t'. */
+#undef HAVE_MODE_T
+
 /* Define if struct msghdr contains msg_accrights */
 #undef HAVE_MSGHDR_ACCRIGHTS
 
@@ -299,12 +299,12 @@
 /* Define to 1 if you have the <net/if.h> header file. */
 #undef HAVE_NET_IF_H
 
+/* Define to 1 if the system has the type `off_t'. */
+#undef HAVE_OFF_T
+
 /* Define if OpenGL is present on the system */
 #undef HAVE_OPENGL
 
-/* Define to 1 if you have the `openpty' function. */
-#undef HAVE_OPENPTY
-
 /* Define if you have the Open Sound system */
 #undef HAVE_OSS
 
@@ -314,6 +314,9 @@
 /* Define to 1 if you have the `pclose' function. */
 #undef HAVE_PCLOSE
 
+/* Define to 1 if the system has the type `pid_t'. */
+#undef HAVE_PID_T
+
 /* Define to 1 if you have the `popen' function. */
 #undef HAVE_POPEN
 
@@ -356,6 +359,9 @@
 /* Define to 1 if you have the `sigaltstack' function. */
 #undef HAVE_SIGALTSTACK
 
+/* Define to 1 if the system has the type `size_t'. */
+#undef HAVE_SIZE_T
+
 /* Define if struct sockaddr contains sa_len */
 #undef HAVE_SOCKADDR_SA_LEN
 
@@ -368,6 +374,9 @@
 /* Define to 1 if you have the <soundcard.h> header file. */
 #undef HAVE_SOUNDCARD_H
 
+/* Define to 1 if the system has the type `ssize_t'. */
+#undef HAVE_SSIZE_T
+
 /* Define to 1 if you have the `statfs' function. */
 #undef HAVE_STATFS
 
@@ -641,15 +650,3 @@
 /* Define as `__inline' if that's what the C compiler calls it, or to nothing
    if it is not supported. */
 #undef inline
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef mode_t
-
-/* Define to `long' if <sys/types.h> does not define. */
-#undef off_t
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef pid_t
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-#undef size_t

include/wine/library.h

@@ -28,6 +28,9 @@
 
 typedef void (*load_dll_callback_t)( void *, const char * );
 
+extern void *wine_dlopen( const char *filename, int flag, char *error, int errorsize );
+extern void *wine_dlsym( void *handle, const char *symbol, char *error, int errorsize );
+extern int wine_dlclose( void *handle, char *error, int errorsize );
 extern void wine_dll_set_callback( load_dll_callback_t load );
 extern void *wine_dll_load( const char *filename, char *error, int errorsize );
 extern void *wine_dll_load_main_exe( const char *name, int search_path,

library/port.c

@@ -210,56 +210,6 @@ int strncasecmp( const char *str1, const char *str2, size_t n )
 #endif /* HAVE_STRNCASECMP */
 
 /***********************************************************************
- *		openpty
- * NOTE
- *   It looks like the openpty that comes with glibc in RedHat 5.0
- *   is buggy (second call returns what looks like a dup of 0 and 1
- *   instead of a new pty), this is a generic replacement.
- *
- * FIXME
- *   We should have a autoconf check for this.
- */
-#ifndef HAVE_OPENPTY
-int openpty(int *master, int *slave, char *name, struct termios *term, struct winsize *winsize)
-{
-    const char *ptr1, *ptr2;
-    char pts_name[512];
-
-    strcpy (pts_name, "/dev/ptyXY");
-
-    for (ptr1 = "pqrstuvwxyzPQRST"; *ptr1 != 0; ptr1++) {
-        pts_name[8] = *ptr1;
-        for (ptr2 = "0123456789abcdef"; *ptr2 != 0; ptr2++) {
-            pts_name[9] = *ptr2;
-
-            if ((*master = open(pts_name, O_RDWR)) < 0) {
-                if (errno == ENOENT)
-                    return -1;
-                else
-                    continue;
-            }
-            pts_name[5] = 't';
-            if ((*slave = open(pts_name, O_RDWR)) < 0) {
-                pts_name[5] = 'p';
-		close (*master);
-                continue;
-            }
-
-            if (term != NULL)
-                tcsetattr(*slave, TCSANOW, term);
-            if (winsize != NULL)
-                ioctl(*slave, TIOCSWINSZ, winsize);
-            if (name != NULL)
-                strcpy(name, pts_name);
-            return *slave;
-        }
-    }
-    errno = EMFILE;
-    return -1;
-}
-#endif  /* HAVE_OPENPTY */
-
-/***********************************************************************
  *		getnetbyaddr
  */
 #ifndef HAVE_GETNETBYADDR
@@ -437,17 +387,6 @@ ssize_t pwrite( int fd, const void *buf, size_t count, off_t offset )
 #endif /* HAVE_PWRITE */
 
 
-/***********************************************************************
- *		getrlimit
- */
-#ifndef HAVE_GETRLIMIT
-int getrlimit (int resource, struct rlimit *rlim)
-{
-    return -1; /* FAIL */
-}
-#endif /* HAVE_GETRLIMIT */
-
-
 #if defined(__svr4__) || defined(__NetBSD__)
 /***********************************************************************
  *             try_mmap_fixed

misc/registry.c

@@ -34,6 +34,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <stdlib.h>
 #include <string.h>

objects/enhmetafile.c

@@ -31,6 +31,9 @@
  *
  */ 
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <string.h>
 #include <assert.h>
 #include "winnls.h"

ole/ole2nls.c

@@ -20,6 +20,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>

programs/regedit/regproc.c

@@ -20,6 +20,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <stdio.h>
 #include <windows.h>
 #include <winnt.h>

programs/wineconsole/wineconsole.c

@@ -18,6 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <stdio.h>
 #include "wine/server.h"
 #include "wine/unicode.h"

scheduler/process.c

@@ -18,6 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>

scheduler/pthread.c

@@ -22,6 +22,8 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
+
 #define _GNU_SOURCE /* we may need to override some GNU extensions */
 
 #include <assert.h>

server/atom.c

@@ -19,6 +19,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>

server/console.c

@@ -21,6 +21,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <assert.h>
 #include <string.h>

server/debugger.c

@@ -18,6 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <assert.h>
 #include <signal.h>
 #include <string.h>

server/event.c

@@ -18,6 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>

server/handle.c

@@ -18,6 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <assert.h>
 #include <limits.h>
 #include <string.h>

server/mapping.c

@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <assert.h>
 #include <stdio.h>

server/mutex.c

@@ -18,6 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>

server/named_pipe.c

@@ -23,6 +23,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <assert.h>
 #include <fcntl.h>

server/object.c

 /*
  * Server-side objects
- * These are the server equivalent of K32OBJ
  *
  * Copyright (C) 1998 Alexandre Julliard
  *
@@ -19,6 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <assert.h>
 #include <limits.h>
 #include <stdlib.h>

server/process.c

@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <assert.h>
 #include <errno.h>

server/queue.c

@@ -18,6 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>

server/registry.c

@@ -24,6 +24,9 @@
  * - symbolic links
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>

server/semaphore.c

@@ -18,6 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>

server/snapshot.c

@@ -20,6 +20,9 @@
  * FIXME: heap snapshots not implemented
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>

server/thread.c

@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <assert.h>
 #include <errno.h>

server/timer.c

@@ -18,6 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>

server/trace.c

@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <ctype.h>
 #include <stdio.h>

server/unicode.c

@@ -18,6 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <ctype.h>
 #include <stdio.h>
 

server/window.c

@@ -18,6 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <assert.h>
 
 #include "winbase.h"

tools/makedep.c

@@ -18,6 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>

tools/winedump/misc.c

@@ -17,6 +17,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
+#include "config.h"
+#include "wine/port.h"
+
 #include "winedump.h"
 
 

tools/winedump/msmangle.c

@@ -17,6 +17,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
+#include "config.h"
+#include "wine/port.h"
+
 #include "winedump.h"
 
 /* Type for parsing mangled types */

tools/winedump/output.c

@@ -17,6 +17,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
+#include "config.h"
+#include "wine/port.h"
+
 #include "winedump.h"
 
 /* Output files */

tools/winedump/pe.c

@@ -18,6 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>

tools/winedump/search.c

@@ -17,6 +17,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
+#include "config.h"
+#include "wine/port.h"
+
 #include "winedump.h"
 
 static char *grep_buff = NULL;

tools/winedump/symbol.c

@@ -17,6 +17,10 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
+#include "config.h"
+#include "wine/port.h"
+
 #include "winedump.h"
 
 

tools/wmc/utils.c

@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <stdio.h>
 #include <stdlib.h>

tools/wrc/readres.c

@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <stdio.h>
 #include <stdlib.h>

tools/wrc/utils.c

@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <assert.h>
 #include <stdio.h>

win32/console.c

@@ -28,6 +28,7 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
 
 #include <stdio.h>
 #include <string.h>

win32/editline.c

@@ -19,6 +19,8 @@
  */
 
 #include "config.h"
+#include "wine/port.h"
+
 #include <string.h>
 
 #include "windef.h"

windows/win.c

@@ -18,6 +18,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "config.h"
+#include "wine/port.h"
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>