Commit 624cbd7c authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard

Fixes for Solaris X86.

parent 0dae2583
......@@ -898,6 +898,7 @@ AC_CHECK_HEADERS(\
sys/file.h \
sys/filio.h \
sys/ipc.h \
sys/link.h \
sys/lwp.h \
sys/mman.h \
sys/modem.h \
......
......@@ -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
......
......@@ -322,6 +322,9 @@
/* Define if you have the <sys/ipc.h> header file. */
#undef HAVE_SYS_IPC_H
/* Define if you have the <sys/link.h> header file. */
#undef HAVE_SYS_LINK_H
/* Define if you have the <sys/lwp.h> header file. */
#undef HAVE_SYS_LWP_H
......
......@@ -372,10 +372,11 @@ void MODULE_InitLoadOrder(void)
static BOOL get_list_load_order( const char *module, const struct loadorder_list *list,
enum loadorder_type lo[] )
{
module_loadorder_t tmp, *res;
module_loadorder_t tmp, *res = NULL;
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);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment