cvs: php4 /ext/ircg ircg_common.c
| From: | Sascha Schumann | Date: | Wed, 30 Apr 2003 08:22:53 +0000 |
| Subject: | cvs: php4 /ext/ircg ircg_common.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-20595@lists.php.net to get a copy of this message | ||
sas Wed Apr 30 04:22:53 2003 EDT
Modified files:
/php4/ext/ircg ircg_common.c
Log:
Fix dlsym usage for Solaris
Index: php4/ext/ircg/ircg_common.c
diff -u php4/ext/ircg/ircg_common.c:1.9 php4/ext/ircg/ircg_common.c:1.10
--- php4/ext/ircg/ircg_common.c:1.9 Mon Apr 28 16:04:24 2003
+++ php4/ext/ircg/ircg_common.c Wed Apr 30 04:22:53 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ircg_common.c,v 1.9 2003/04/28 20:04:24 sas Exp $ */
+/* $Id: ircg_common.c,v 1.10 2003/04/30 08:22:53 sas Exp $ */
#if YOU_ARE_SANE
@@ -230,6 +230,10 @@
#endif
+#ifndef RTLD_DEFAULT
+#define RTLD_DEFAULT NULL
+#endif
+
void php_ircg_init_compat(TSRMLS_D)
{
#ifdef PHP_IRCG_COMPATIBLE
@@ -237,29 +241,29 @@
if (strcmp(sapi_module.name, "apache") == 0) {
is_apache = 1;
- php_ircg_ap_user_id = dlsym(NULL, "ap_user_id");
- php_ircg_ap_group_id = dlsym(NULL, "ap_group_id");
+ php_ircg_ap_user_id = dlsym(RTLD_DEFAULT, "ap_user_id");
+ php_ircg_ap_group_id = dlsym(RTLD_DEFAULT, "ap_group_id");
} else if (strcmp(sapi_module.name, "apache2filter") == 0
|| strcmp(sapi_module.name, "apache2handler") == 0) {
is_apache2 = 1;
- php_ircg_apa2_core_module = dlsym(NULL, "core_module");
- php_ircg_apa2_get_module_config = dlsym(NULL,
+ php_ircg_apa2_core_module = dlsym(RTLD_DEFAULT, "core_module");
+ php_ircg_apa2_get_module_config = dlsym(RTLD_DEFAULT,
"ap_get_module_config");
- php_ircg_apa2_unixd_config = dlsym(NULL, "unixd_config");
+ php_ircg_apa2_unixd_config = dlsym(RTLD_DEFAULT, "unixd_config");
}
- p = dlsym(NULL, "sapi_get_fd");
+ p = dlsym(RTLD_DEFAULT, "sapi_get_fd");
php_ircg_sapi_get_fd = p ? p : php_ircg_get_fd;
- p = dlsym(NULL, "sapi_force_http_10");
+ p = dlsym(RTLD_DEFAULT, "sapi_force_http_10");
php_ircg_sapi_force_http_10 = p ? p : php_ircg_force_http_10;
- p = dlsym(NULL, "sapi_get_target_uid");
+ p = dlsym(RTLD_DEFAULT, "sapi_get_target_uid");
php_ircg_sapi_get_target_uid = p ? p : php_ircg_get_target_uid;
- p = dlsym(NULL, "sapi_get_target_gid");
+ p = dlsym(RTLD_DEFAULT, "sapi_get_target_gid");
php_ircg_sapi_get_target_gid = p ? p : php_ircg_get_target_gid;
#endif
}