libsigc++ update to fix struct timespec bug

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1035 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 9e75660b71fca0a376bd0dc4c89cc51aad338d90..7d4c54ba7026b4f207eb02e03caf96fa3c8b5aaa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-25  Allan Rae  <rae@lyx.org>
+
+       * sigc++: updated libsigc++.  Fixes struct timespec bug.
+
+       * development/tools/makeLyXsigc.sh:  .cvsignore addition
+
 2000-09-23  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * several files: removed almost all traces of the old table

diff --git a/development/tools/makeLyXsigc.sh b/development/tools/makeLyXsigc.sh
index 84b436ab444747b28d47794612b92253f558901c..481be41ea6123f6b13ca9dc5af66ac3af6754182 100644 (file)
--- a/development/tools/makeLyXsigc.sh
+++ b/development/tools/makeLyXsigc.sh
@@ -360,6 +360,7 @@ sigc-config
 stamp*
 sigc++config.h
 sigc++config.h.in
+acinclude.m4
 EOF
 )
 

diff --git a/sigc++/configure.in b/sigc++/configure.in
index f0d21b711a3db58d9df9fd9f26ff6060ac9fa5ed..f88125f16f19c599fb7c461503f7996a21074fe9 100644 (file)
--- a/sigc++/configure.in
+++ b/sigc++/configure.in
@@ -33,7 +33,7 @@ dnl
 dnl Source packaging numbers
 SIGC_MAJOR_VERSION=1
 SIGC_MINOR_VERSION=0
-SIGC_MICRO_VERSION=0
+SIGC_MICRO_VERSION=1
 
 dnl Library extension
 SIGC_RELEASE=1.0
@@ -609,7 +609,7 @@ ac_thread_mutex_impl_size=
 ac_thread_thread_attr_size=
 ac_thread_thread_impl_size=
 ac_thread_key_impl_size=
-' > ac_thread.sh
+' > ./ac_thread.sh
    AC_MSG_ERROR(
 [You are attempting a cross compile, but the necessary information regarding
 your thread library is not available.  Please fill out the ac_thread.sh file.

diff --git a/sigc++/thread.cc b/sigc++/thread.cc
index 035a2980b1757170952ee7f9f368463367e46a9b..43ad7c14ed226e70a7d1cf0145471087ea2a7059 100644 (file)
--- a/sigc++/thread.cc
+++ b/sigc++/thread.cc
@@ -53,7 +53,7 @@ Condition::~Condition()
 int Condition::signal()       {return pthread_cond_signal(&cond_);}
 int Condition::broadcast()    {return pthread_cond_broadcast(&cond_);}
 int Condition::wait(Mutex &m) {return pthread_cond_wait(&cond_,m);}
-int Condition::wait(Mutex &m,timespec* spec)
+int Condition::wait(Mutex &m,struct timespec* spec)
   {return pthread_cond_timedwait(&cond_,m,spec);}
 int Condition::destroy()      {return pthread_cond_destroy(&cond_);}
 

diff --git a/sigc++/thread.h b/sigc++/thread.h
index 2228c5345ce1ff2fce1db8e9c5ea6f9a20de3b6f..ae9696a654e38f9d10b9aa7c39c97470c9b3b399 100644 (file)
--- a/sigc++/thread.h
+++ b/sigc++/thread.h
@@ -121,7 +121,7 @@ struct Condition
 
      // unlocks a mutex while waiting on a condition, then reaquires lock
      // with a fixed maximum duration.
-     int wait(Mutex &m,timespec* spec);
+     int wait(Mutex &m,struct timespec* spec);
 
   };