- add phpext_pgsql_ptr

- semaphore update for glibc-2.1 systems

diff --git a/ext/pgsql/php3_pgsql.h b/ext/pgsql/php3_pgsql.h
index 097e168d94425eb24dedd31f4a057afc24fb7578..765c124d104cf3126b8a2e1d95bd1a4c675b0731 100644 (file)
--- 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 4107f1477cb4371508da622aa124d8a179835047..d143e4278a4d04339ac41d4595019077fe67eeff 100644 (file)
--- 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},