summaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorljrittle <ljrittle@138bc75d-0d04-0410-961f-82ee72b054a4>2001-05-30 22:38:43 +0000
committerljrittle <ljrittle@138bc75d-0d04-0410-961f-82ee72b054a4>2001-05-30 22:38:43 +0000
commit88025ea7075bae6ff88b8894f8aef77a22b46786 (patch)
treec3eae3462fa788da0370dbeaf1b5838304c92fe2 /gcc
parenta94e5126ff25d3ec64cdeb750fc684e54afb4795 (diff)
downloadgcc-88025ea7075bae6ff88b8894f8aef77a22b46786.tar.gz
* gthr-posix.h (__gthread_active_ptr): Cast function pointer
to target type to allow ISO C++ compiler to accept it. * gthr-dce.h (__gthread_active_ptr): Likewise. * gthr-solaris.h (__gthread_active_ptr): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42725 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/gthr-dce.h2
-rw-r--r--gcc/gthr-posix.h2
-rw-r--r--gcc/gthr-solaris.h2
4 files changed, 11 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 30e91df77a3..464d6257440 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2001-05-30 Loren J. Rittle <ljrittle@acm.org>
+ John David Anglin <dave@hiauly1.hia.nrc.ca>
+
+ * gthr-posix.h (__gthread_active_ptr): Cast function pointer
+ to target type to allow ISO C++ compiler to accept it.
+ * gthr-dce.h (__gthread_active_ptr): Likewise.
+ * gthr-solaris.h (__gthread_active_ptr): Likewise.
+
2001-05-30 Neil Booth <neil@daikokuya.demon.co.uk>
* cpplex.c (_cpp_lex_token): Revert patch of 16 May 2001
diff --git a/gcc/gthr-dce.h b/gcc/gthr-dce.h
index ce77bf12915..96660a334ef 100644
--- a/gcc/gthr-dce.h
+++ b/gcc/gthr-dce.h
@@ -79,7 +79,7 @@ typedef pthread_mutex_t __gthread_mutex_t;
#pragma weak pthread_yield
#endif
-static void *__gthread_active_ptr = &pthread_create;
+static void *__gthread_active_ptr = (void *) &pthread_create;
static inline int
__gthread_active_p (void)
diff --git a/gcc/gthr-posix.h b/gcc/gthr-posix.h
index 7ffb0a08f54..b5a4637f592 100644
--- a/gcc/gthr-posix.h
+++ b/gcc/gthr-posix.h
@@ -75,7 +75,7 @@ typedef pthread_mutex_t __gthread_mutex_t;
#pragma weak pthread_setschedparam
#endif
-static void *__gthread_active_ptr = &pthread_create;
+static void *__gthread_active_ptr = (void *) &pthread_create;
static inline int
__gthread_active_p (void)
diff --git a/gcc/gthr-solaris.h b/gcc/gthr-solaris.h
index 14996101824..6955753d782 100644
--- a/gcc/gthr-solaris.h
+++ b/gcc/gthr-solaris.h
@@ -81,7 +81,7 @@ typedef mutex_t __gthread_mutex_t;
/* This will not actually work in Solaris 2.5, since libc contains
dummy symbols of all thr_* routines. */
-static void *__gthread_active_ptr = &thr_create;
+static void *__gthread_active_ptr = (void *) &thr_create;
static inline int
__gthread_active_p (void)