fixes for Solaris X86
eric pouech
eric.pouech at wanadoo.fr
Fri Aug 10 11:19:55 CDT 2001
as spotted and fixed by Robert Lunnon <bob at yarrabee.net.au>
A+
--
---------------
Eric Pouech (http://perso.wanadoo.fr/eric.pouech/)
"The future will be better tomorrow", Vice President Dan Quayle
-------------- next part --------------
Name: solaris
ChangeLog: fixes for Solaris X86
GenDate: 2001/08/10 16:17:05 UTC
ModifiedFiles: loader/loadorder.c configure.in debugger/stabs.c
AddedFiles:
===================================================================
RCS file: /usr/share/cvs/cvsroot/wine/wine/loader/loadorder.c,v
retrieving revision 1.45
diff -u -u -r1.45 loadorder.c
--- loader/loadorder.c 2001/07/24 21:45:24 1.45
+++ loader/loadorder.c 2001/08/10 16:13:49
@@ -375,7 +375,8 @@
module_loadorder_t tmp, *res;
tmp.modulename = module;
- if ((res = bsearch(&tmp, list->order, list->count, sizeof(list->order[0]), cmp_sort_func)))
+ /* some bsearch implementations (Solaris) are buggy when the number of items is 0 */
+ if (list->count && (res = bsearch(&tmp, list->order, list->count, sizeof(list->order[0]), cmp_sort_func)))
memcpy( lo, res->loadorder, sizeof(res->loadorder) );
return (res != NULL);
}
Index: configure.in
===================================================================
RCS file: /usr/share/cvs/cvsroot/wine/wine/configure.in,v
retrieving revision 1.220
diff -u -u -r1.220 configure.in
--- configure.in 2001/08/08 23:21:17 1.220
+++ configure.in 2001/08/10 16:14:13
@@ -898,6 +898,7 @@
sys/file.h \
sys/filio.h \
sys/ipc.h \
+ sys/link.h \
sys/lwp.h \
sys/mman.h \
sys/modem.h \
Index: debugger1/stabs.c
===================================================================
RCS file: /usr/share/cvs/cvsroot/wine/wine/debugger/stabs.c,v
retrieving revision 1.40
diff -u -u -r1.40 stabs.c
--- debugger1/stabs.c 2001/05/21 18:33:15 1.40
+++ debugger1/stabs.c 2001/08/10 16:14:40
@@ -36,6 +36,9 @@
#ifdef HAVE_LINK_H
# include <link.h>
#endif
+#ifdef HAVE_SYS_LINK_H
+# include <sys/link.h>
+#endif
#endif
#ifndef N_UNDF
More information about the wine-patches
mailing list