Просмотр исходного кода

Made pthread optional
Author: jgg
Date: 1999-08-05 05:55:45 GMT
Made pthread optional

Arch Librarian лет назад: 22
Родитель
Сommit
afd9aaf3f1
2 измененных файлов с 5 добавлено и 3 удалено
  1. 4 2
      apt-pkg/contrib/error.cc
  2. 1 1
      configure.in

+ 4 - 2
apt-pkg/contrib/error.cc

@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: error.cc,v 1.6 1999/01/18 06:20:07 jgg Exp $
+// $Id: error.cc,v 1.7 1999/08/05 05:55:45 jgg Exp $
 /* ######################################################################
    
    Global Erorr Class - Global error mechanism
@@ -26,6 +26,7 @@
 #include <stdarg.h>
 #include <unistd.h>
 
+#include "config.h"
    									/*}}}*/
 
 // Global Error Object							/*{{{*/
@@ -33,8 +34,9 @@
    is compiled to be thread safe otherwise a non-safe version is used. A
    Per-Thread error object is maintained in much the same manner as libc
    manages errno */
-#if _POSIX_THREADS == 1
+#if _POSIX_THREADS == 1 && defined(HAVE_PTHREAD)
  #include <pthread.h>
+ #error PTHREAD
 
  static pthread_key_t ErrorKey;
  static void ErrorDestroy(void *Obj) {delete (GlobalError *)Obj;};

+ 1 - 1
configure.in

@@ -62,7 +62,7 @@ if test "$with_gpm" != "no"; then
 fi
 
 dnl Checks for pthread
-AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD) PTHREADLIB="-lpthread"])
+#AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD) PTHREADLIB="-lpthread"])
 AC_SUBST(PTHREADLIB)
 #if test "$PTHREADLIB" != "-lpthread"; then
 #  AC_MSG_ERROR(failed: I need posix threads, pthread)