summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRasmus Lerdorf <rasmus@php.net>2000-04-14 13:14:30 +0000
committerRasmus Lerdorf <rasmus@php.net>2000-04-14 13:14:30 +0000
commit2acd0ad1fe810d81b3e8afab284eb6a8276d9ae1 (patch)
treeaba777ea149651c66d131f2ce34b9a84882d554b
parent2206a9f7ddea40bd4f9b936053ef51e48c6a0061 (diff)
downloadphp-git-2acd0ad1fe810d81b3e8afab284eb6a8276d9ae1.tar.gz
I don't see why this should be gcc dependant and this fixes bugs 4140
and 4143
-rw-r--r--ext/sysvsem/sysvsem.c2
-rw-r--r--main/php_version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c
index 2a1442bc02..e9e040bc93 100644
--- a/ext/sysvsem/sysvsem.c
+++ b/ext/sysvsem/sysvsem.c
@@ -35,7 +35,7 @@
#include "php_sysvsem.h"
-#if !HAVE_SEMUN && defined(__GNU_LIBRARY__) && __GNU_LIBRARY__ == 6
+#if !HAVE_SEMUN
union semun {
int val; /* value for SETVAL */
diff --git a/main/php_version.h b/main/php_version.h
index bf87c75012..9e74c0fb1e 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -1,3 +1,3 @@
/* automatically generated by configure */
/* edit configure.in to change version number */
-#define PHP_VERSION "4.0RC2-dev"
+#define PHP_VERSION "4.0RC1"