1999-02-22 03:25:12 +00:00
|
|
|
diff -urN wine-990131/configure fbsd-wine-990131/configure
|
|
|
|
--- wine-990131/configure Fri Feb 12 23:40:37 1999
|
|
|
|
+++ fbsd-wine-990131/configure Fri Feb 12 23:42:18 1999
|
|
|
|
@@ -3021,7 +3021,7 @@
|
|
|
|
if (ac_test) return 1
|
|
|
|
; return 0; }
|
|
|
|
EOF
|
|
|
|
-if { (eval echo configure:3025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
|
|
|
+if { (eval echo configure:3025: \"$ac_link\") 1>&5; (eval $ac_link) </dev/null 2>&5; } && test -s conftest; then
|
|
|
|
rm -rf conftest*
|
|
|
|
ac_cv_c_extern_prefix="yes"
|
|
|
|
else
|
|
|
|
@@ -3062,7 +3062,7 @@
|
1998-05-13 22:21:18 +00:00
|
|
|
|
1999-02-22 03:25:12 +00:00
|
|
|
; return 0; }
|
|
|
|
EOF
|
|
|
|
-if { (eval echo configure:3066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
|
|
|
|
+if { (eval echo configure:3066: \"$ac_link\") 1>&5; (eval $ac_link) </dev/null 2>&5; } && test -s conftest; then
|
|
|
|
rm -rf conftest*
|
|
|
|
ac_cv_c_asm_string="yes"
|
|
|
|
else
|
|
|
|
diff -urN wine-990131/debugger/stabs.c fbsd-wine-990131/debugger/stabs.c
|
|
|
|
--- wine-990131/debugger/stabs.c Wed Jan 20 23:18:55 1999
|
|
|
|
+++ fbsd-wine-990131/debugger/stabs.c Fri Feb 12 23:11:42 1999
|
|
|
|
@@ -4,6 +4,7 @@
|
|
|
|
* Copyright (C) 1996, Eric Youngdale.
|
|
|
|
*/
|
1998-05-13 22:21:18 +00:00
|
|
|
|
1999-02-22 03:25:12 +00:00
|
|
|
+#include <sys/types.h>
|
|
|
|
#include "config.h"
|
1998-05-13 22:21:18 +00:00
|
|
|
|
1999-02-22 03:25:12 +00:00
|
|
|
#include <sys/types.h>
|
|
|
|
diff -urN wine-990131/include/ldt.h fbsd-wine-990131/include/ldt.h
|
|
|
|
--- wine-990131/include/ldt.h Mon Dec 7 19:48:09 1998
|
|
|
|
+++ fbsd-wine-990131/include/ldt.h Fri Feb 12 23:11:42 1999
|
|
|
|
@@ -85,6 +85,14 @@
|
1998-05-13 22:21:18 +00:00
|
|
|
|
1999-02-22 03:25:12 +00:00
|
|
|
#define FIRST_LDT_ENTRY_TO_ALLOC 17
|
1998-05-13 22:21:18 +00:00
|
|
|
|
|
|
|
+#ifdef __FreeBSD__
|
|
|
|
+#include <osreldate.h>
|
|
|
|
+#if __FreeBSD_version < 220000
|
1999-02-22 03:25:12 +00:00
|
|
|
+#undef FIRST_LDT_ENTRY_TO_ALLOC
|
1998-05-13 22:21:18 +00:00
|
|
|
+#define FIRST_LDT_ENTRY_TO_ALLOC 6
|
|
|
|
+#endif
|
1999-02-22 03:25:12 +00:00
|
|
|
+#endif
|
|
|
|
+
|
|
|
|
/* Determine if sel is a system selector (i.e. not managed by Wine) */
|
|
|
|
#define IS_SELECTOR_SYSTEM(sel) \
|
|
|
|
(!((sel) & 4) || (SELECTOR_TO_ENTRY(sel) < FIRST_LDT_ENTRY_TO_ALLOC))
|
|
|
|
diff -urN wine-990131/memory/virtual.c fbsd-wine-990131/memory/virtual.c
|
|
|
|
--- wine-990131/memory/virtual.c Fri Jan 29 02:35:36 1999
|
|
|
|
+++ fbsd-wine-990131/memory/virtual.c Fri Feb 12 23:11:42 1999
|
1998-05-13 22:21:18 +00:00
|
|
|
@@ -1097,6 +1097,9 @@
|
1999-02-22 03:25:12 +00:00
|
|
|
}
|
|
|
|
K32OBJ_DecCount( obj );
|
|
|
|
return handle;
|
1998-05-13 22:21:18 +00:00
|
|
|
+#ifndef MS_SYNC
|
|
|
|
+#define MS_SYNC 0
|
|
|
|
+#endif MS_SYNC
|
1999-02-22 03:25:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Check parameters */
|
|
|
|
diff -urN wine-990131/ole/variant.c fbsd-wine-990131/ole/variant.c
|
|
|
|
--- wine-990131/ole/variant.c Mon Jan 18 01:34:32 1999
|
|
|
|
+++ fbsd-wine-990131/ole/variant.c Fri Feb 12 23:11:42 1999
|
|
|
|
@@ -30,6 +30,7 @@
|
|
|
|
|
1998-05-13 22:21:18 +00:00
|
|
|
#include <string.h>
|
|
|
|
#include <stdlib.h>
|
1999-02-22 03:25:12 +00:00
|
|
|
+#include <float.h>
|
|
|
|
#include <math.h>
|
|
|
|
#include <time.h>
|
|
|
|
|
|
|
|
diff -urN wine-990131/windows/dialog.c fbsd-wine-990131/windows/dialog.c
|
|
|
|
--- wine-990131/windows/dialog.c Fri Feb 12 23:30:15 1999
|
|
|
|
+++ fbsd-wine-990131/windows/dialog.c Fri Feb 12 23:11:42 1999
|
|
|
|
@@ -9,6 +9,9 @@
|
|
|
|
#include <limits.h>
|
|
|
|
#include <stdlib.h>
|
1998-05-13 22:21:18 +00:00
|
|
|
#include <string.h>
|
|
|
|
+#ifdef __FreeBSD__
|
|
|
|
+#include <sys/errno.h>
|
|
|
|
+#endif
|
|
|
|
#include "windows.h"
|
|
|
|
#include "dialog.h"
|
1999-02-22 03:25:12 +00:00
|
|
|
#include "drive.h"
|
|
|
|
diff -urN wine-990131/wine.ini fbsd-wine-990131/wine.ini
|
|
|
|
--- wine-990131/wine.ini Thu Oct 22 01:03:16 1998
|
|
|
|
+++ fbsd-wine-990131/wine.ini Fri Feb 12 23:11:41 1999
|
|
|
|
@@ -44,7 +44,7 @@
|
1998-05-13 22:21:18 +00:00
|
|
|
System=c:\windows\system
|
|
|
|
Temp=e:\
|
|
|
|
Path=c:\windows;c:\windows\system;e:\;e:\test;f:\
|
|
|
|
-SymbolTableFile=./wine.sym
|
|
|
|
+SymbolTableFile=/usr/local/etc/wine.sym
|
|
|
|
|
|
|
|
[options]
|
|
|
|
AllocSystemColors=100
|
1999-02-22 03:25:12 +00:00
|
|
|
@@ -55,13 +55,13 @@
|
1998-05-13 22:21:18 +00:00
|
|
|
Default = -adobe-times-
|
|
|
|
|
|
|
|
[serialports]
|
|
|
|
-Com1=/dev/cua0
|
|
|
|
-Com2=/dev/cua1
|
|
|
|
+Com1=/dev/ttyd0
|
|
|
|
+Com2=/dev/ttyd1
|
|
|
|
Com3=/dev/modem,38400
|
|
|
|
Com4=/dev/modem
|
|
|
|
|
|
|
|
[parallelports]
|
|
|
|
-Lpt1=/dev/lp0
|
|
|
|
+Lpt1=/dev/lpt0
|
|
|
|
|
|
|
|
[spooler]
|
|
|
|
LPT1:=|lpr
|
1999-02-22 03:25:12 +00:00
|
|
|
@@ -81,4 +81,4 @@
|
|
|
|
|
|
|
|
[programs]
|
|
|
|
Default=
|
|
|
|
-Startup=
|
|
|
|
+Startup=
|