MSVC compatibility fixes.

This commit is contained in:
Patrik Stridvall 2002-08-26 21:53:24 +00:00 committed by Alexandre Julliard
parent dd1484a219
commit 57bf45067a
20 changed files with 76 additions and 17 deletions

6
configure vendored
View File

@ -11909,6 +11909,9 @@ done
@ -11958,6 +11961,7 @@ for ac_header in \
sys/mount.h \
sys/msg.h \
sys/param.h \
sys/poll.h \
sys/ptrace.h \
sys/reg.h \
sys/shm.h \
@ -11969,6 +11973,7 @@ for ac_header in \
sys/syscall.h \
sys/sysctl.h \
sys/time.h \
sys/times.h \
sys/user.h \
sys/v86.h \
sys/v86intr.h \
@ -11979,6 +11984,7 @@ for ac_header in \
termios.h \
ucontext.h \
unistd.h \
utime.h \
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

View File

@ -989,6 +989,7 @@ AC_CHECK_HEADERS(\
sys/mount.h \
sys/msg.h \
sys/param.h \
sys/poll.h \
sys/ptrace.h \
sys/reg.h \
sys/shm.h \
@ -1000,6 +1001,7 @@ AC_CHECK_HEADERS(\
sys/syscall.h \
sys/sysctl.h \
sys/time.h \
sys/times.h \
sys/user.h \
sys/v86.h \
sys/v86intr.h \
@ -1010,6 +1012,7 @@ AC_CHECK_HEADERS(\
termios.h \
ucontext.h \
unistd.h \
utime.h \
)
AC_HEADER_STAT()

View File

@ -74,7 +74,9 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <sys/poll.h>
#ifdef HAVE_SYS_POOL_H
# include <sys/poll.h>
#endif
#ifdef HAVE_SYS_MODEM_H
# include <sys/modem.h>
#endif
@ -2095,4 +2097,3 @@ BOOL WINAPI GetDefaultCommConfigW(
}
return ret;
}

View File

@ -28,7 +28,9 @@
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
#include <sys/times.h>
#ifdef HAVE_SYS_TIMES_H
# include <sys/times.h>
#endif
#include "file.h"
#include "ntddk.h"
#include "winerror.h"
@ -766,4 +768,3 @@ int WINAPI SetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, LPCWST
Locale, Calendar, CalType, debugstr_w(lpCalData));
return 0;
}

View File

@ -21,8 +21,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "config.h"
#include <time.h>
#include <sys/times.h>
#ifdef HAVE_SYS_TIMES_H
# include <sys/times.h>
#endif
#include "msvcrt.h"
#include "msvcrt/sys/timeb.h"

View File

@ -21,10 +21,14 @@
*/
#include "config.h"
#include "wine/port.h"
#include <errno.h>
#include <string.h>
#include <stdio.h>
#ifdef HAVE_IO_H
# include <io.h>
#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif

View File

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

View File

@ -32,7 +32,7 @@ struct error_table
const WORD *table;
};
static const struct error_table error_table[];
static const struct error_table error_table[12];
/**************************************************************************
* RtlNtStatusToDosError (NTDLL.@)

View File

@ -22,6 +22,9 @@
#include <stdlib.h>
#include <string.h>
#ifdef HAVE_IO_H
# include <io.h>
#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif

View File

@ -745,8 +745,13 @@ NTSTATUS WINAPI RtlConvertSidToUnicodeString(
NTSTATUS status;
ANSI_STRING AnsiStr;
struct passwd *pwd = getpwuid( getuid() );
p = (pwd) ? pwd->pw_name : ".Default";
#ifdef HAVE_GETPWUID
struct passwd *pwd = getpwuid( getuid() );
p = pwd ? pwd->pw_name : NULL;
#else
p = getenv("USER");
#endif
p = p ? p : ".Default";
FIXME("(%p %p %u)\n", String, Sid, AllocateString);

View File

@ -44,12 +44,16 @@
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
#include <sys/poll.h>
#ifdef HAVE_SYS_POLL_H
# include <sys/poll.h>
#endif
#include <time.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <utime.h>
#ifdef HAVE_UTIME_H
# include <utime.h>
#endif
#include "winerror.h"
#include "windef.h"

View File

@ -74,12 +74,16 @@
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
#include <sys/poll.h>
#ifdef HAVE_SYS_POLL_H
# include <sys/poll.h>
#endif
#include <time.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <utime.h>
#ifdef HAVE_UTIME_H
# include <utime.h>
#endif
#ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif

View File

@ -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 <string.h>
#include <stdio.h>

View File

@ -497,6 +497,9 @@
/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
/* Define to 1 if you have the <sys/poll.h> header file. */
#undef HAVE_SYS_POLL_H
/* Define to 1 if you have the <sys/ptrace.h> header file. */
#undef HAVE_SYS_PTRACE_H
@ -533,6 +536,9 @@
/* Define to 1 if you have the <sys/sysctl.h> header file. */
#undef HAVE_SYS_SYSCTL_H
/* Define to 1 if you have the <sys/times.h> header file. */
#undef HAVE_SYS_TIMES_H
/* Define to 1 if you have the <sys/time.h> header file. */
#undef HAVE_SYS_TIME_H
@ -575,6 +581,9 @@
/* Define to 1 if you have the `usleep' function. */
#undef HAVE_USLEEP
/* Define to 1 if you have the <utime.h> header file. */
#undef HAVE_UTIME_H
/* Define if we have va_copy */
#undef HAVE_VA_COPY

View File

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

View File

@ -21,6 +21,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "config.h"
#include "wine/port.h"
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
@ -401,7 +404,7 @@ static DWORD VERSION_GetSystemDLLVersion( HMODULE hmod )
* 5.12/5.00/5.00/4.00 Win98 calc
* x.xx/5.00/5.00/4.00 win95/win98/NT4 IE5 files
*/
DWORD VERSION_GetLinkedDllVersion(void)
static DWORD VERSION_GetLinkedDllVersion(void)
{
WINE_MODREF *wm;
DWORD WinVersion = NB_WINDOWS_VERSIONS;
@ -1004,7 +1007,7 @@ void WINAPI DebugFillBuffer(LPSTR lpBuffer, WORD wBytes)
*
* returns TRUE if Win called with "/b" (bootlog.txt)
*/
BOOL16 WINAPI DiagQuery16()
BOOL16 WINAPI DiagQuery16(void)
{
/* perhaps implement a Wine "/b" command line flag sometime ? */
return FALSE;

View File

@ -19,6 +19,7 @@
*/
#include "config.h"
#include "wine/port.h"
#include <time.h>
#ifdef HAVE_SYS_TIME_H

View File

@ -40,7 +40,9 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <utime.h>
#ifdef HAVE_UTIME_H
# include <utime.h>
#endif
#include <ctype.h>
#include "windef.h"
#include "winbase.h"
@ -2389,4 +2391,3 @@ FARPROC16 WINAPI GetSetKernelDOSProc16(FARPROC16 DosProc)
FIXME("(DosProc=0x%08x): stub\n", (UINT)DosProc);
return NULL;
}

View File

@ -26,7 +26,9 @@
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
#include <sys/poll.h>
#ifdef HAVE_SYS_POLL_H
# include <sys/poll.h>
#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif

View File

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