summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>1999-05-21 08:04:38 +0000
committerSascha Schumann <sas@php.net>1999-05-21 08:04:38 +0000
commit0fe7fe30b576d34155aad1f32a1bbd23eada93e4 (patch)
tree7a49ad1e3079713804881f64e617f26986dc3144
parent672e38da935c61885fa1cc29eee4591467d6b4ba (diff)
downloadphp-git-0fe7fe30b576d34155aad1f32a1bbd23eada93e4.tar.gz
- add phpext_pgsql_ptr
- semaphore update for glibc-2.1 systems
-rw-r--r--ext/pgsql/php3_pgsql.h2
-rw-r--r--ext/sysvsem/sysvsem.c15
2 files changed, 16 insertions, 1 deletions
diff --git a/ext/pgsql/php3_pgsql.h b/ext/pgsql/php3_pgsql.h
index 097e168d94..765c124d10 100644
--- a/ext/pgsql/php3_pgsql.h
+++ b/ext/pgsql/php3_pgsql.h
@@ -117,4 +117,6 @@ extern pgsql_module php3_pgsql_module;
#endif
+#define phpext_pgsql_ptr pgsql_module_ptr
+
#endif /* _PHP3_PGSQL_H */
diff --git a/ext/sysvsem/sysvsem.c b/ext/sysvsem/sysvsem.c
index 4107f1477c..d143e4278a 100644
--- a/ext/sysvsem/sysvsem.c
+++ b/ext/sysvsem/sysvsem.c
@@ -2,7 +2,7 @@
+----------------------------------------------------------------------+
| PHP HTML Embedded Scripting Language Version 3.0 |
+----------------------------------------------------------------------+
- | Copyright (c) 1997,1998 PHP Development Team (See Credits file) |
+ | Copyright (c) 1997-1999 PHP Development Team (See Credits file) |
+----------------------------------------------------------------------+
| This program is free software; you can redistribute it and/or modify |
| it under the terms of one of the following licenses: |
@@ -49,6 +49,19 @@
#include "php.h"
#include "php3_sysvsem.h"
+#if !HAVE_SEMUN && defined(__GNU_LIBRARY__) && __GNU_LIBRARY__ == 6
+
+union semun {
+ int val; /* value for SETVAL */
+ struct semid_ds *buf; /* buffer for IPC_STAT, IPC_SET */
+ unsigned short int *array; /* array for GETALL, SETALL */
+ struct seminfo *__buf; /* buffer for IPC_INFO */
+};
+
+#undef HAVE_SEMUN
+#define HAVE_SEMUN 1
+
+#endif
function_entry sysvsem_functions[] = {
{"sem_get", php3_sysvsem_get, NULL},