system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-20 21:44:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove the dummy pthread functions and use -lpthread instead to

Browse source 
resolve missing symbols in GL libs.
This commit is contained in:
Alexandre Julliard 2003-08-20 03:44:25 +00:00
parent f89f3df1a2
commit dd0242de6d
5 changed files with 8 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
configure vendored
View file

@ -8198,6 +8198,10 @@ if test $ac_cv_lib_GLU_gluLookAt = yes; then
fi
if test -n "$OPENGL_LIBS"
then
OPENGL_LIBS="$OPENGL_LIBS -lpthread"
fi
fi
fi
fi
@ -13364,11 +13368,6 @@ fi
@ -13408,11 +13407,6 @@ for ac_func in \
pclose \
popen \
pread \
pthread_getspecific \
pthread_key_create \
pthread_mutex_lock \
pthread_mutex_unlock \
pthread_setspecific \
pwrite \
rfork \
select \

9
configure.ac
View file

@ -341,6 +341,10 @@ This prevents linking to OpenGL. Delete the file and restart configure.])
,,
$OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS
)
if test -n "$OPENGL_LIBS"
then
OPENGL_LIBS="$OPENGL_LIBS -lpthread"
fi
fi
fi
fi
@ -958,11 +962,6 @@ AC_CHECK_FUNCS(\
pclose \
popen \
pread \
pthread_getspecific \
pthread_key_create \
pthread_mutex_lock \
pthread_mutex_unlock \
pthread_setspecific \
pwrite \
rfork \
select \

15
include/config.h.in
View file

@ -395,21 +395,6 @@
/* Define to 1 if you have the `pread' function. */
#undef HAVE_PREAD
/* Define to 1 if you have the `pthread_getspecific' function. */
#undef HAVE_PTHREAD_GETSPECIFIC
/* Define to 1 if you have the `pthread_key_create' function. */
#undef HAVE_PTHREAD_KEY_CREATE
/* Define to 1 if you have the `pthread_mutex_lock' function. */
#undef HAVE_PTHREAD_MUTEX_LOCK
/* Define to 1 if you have the `pthread_mutex_unlock' function. */
#undef HAVE_PTHREAD_MUTEX_UNLOCK
/* Define to 1 if you have the `pthread_setspecific' function. */
#undef HAVE_PTHREAD_SETSPECIFIC
/* Define to 1 if you have the <pty.h> header file. */
#undef HAVE_PTY_H

1
libs/wine/Makefile.in
View file

@ -10,7 +10,6 @@ EXTRALIBS = $(LIBPORT) @DLLIBS@ @CRTLIBS@
C_SRCS = \
config.c \
debug.c \
errno.c \
ldt.c \
loader.c

52
libs/wine/errno.c
View file

@ -1,52 +0,0 @@
/*
* Wine library reentrant errno support
*
* Copyright 1998 Alexandre Julliard
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* 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 <assert.h>
#ifndef HAVE_NPTL
/***********************************************************************
* pthread functions
*
* FIXME: should find a better place for these
*/
#ifndef HAVE_PTHREAD_GETSPECIFIC
void pthread_getspecific() { assert(0); }
#endif
#ifndef HAVE_PTHREAD_KEY_CREATE
void pthread_key_create() { assert(0); }
#endif
#ifndef HAVE_PTHREAD_MUTEX_LOCK
void pthread_mutex_lock() { assert(0); }
#endif
#ifndef HAVE_PTHREAD_MUTEX_UNLOCK
void pthread_mutex_unlock() { assert(0); }
#endif
#ifndef HAVE_PTHREAD_SETSPECIFIC
void pthread_setspecific() { assert(0); }
#endif
#endif /* HAVE_NPTL */