[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/main/main.c trunk/main/main.c

[Pierre Joye]

pajoye                                   Tue, 19 Apr 2011 21:43:22 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=310369

Log:
- fix build >(btw, has novell man pages too?)

Changed paths:
    U   php/php-src/branches/PHP_5_3/main/main.c
    U   php/php-src/trunk/main/main.c

Modified: php/php-src/branches/PHP_5_3/main/main.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/main.c    2011-04-19 18:57:55 UTC (rev 
310368)
+++ php/php-src/branches/PHP_5_3/main/main.c    2011-04-19 21:43:22 UTC (rev 
310369)
@@ -1938,7 +1938,9 @@
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_EXTENSION_DIR", PHP_EXTENSION_DIR, 
sizeof(PHP_EXTENSION_DIR)-1, CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_PREFIX", PHP_PREFIX, 
sizeof(PHP_PREFIX)-1, CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_BINDIR", PHP_BINDIR, 
sizeof(PHP_BINDIR)-1, CONST_PERSISTENT | CONST_CS);
+#ifndef PHP_WIN32
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_MANDIR", PHP_MANDIR, 
sizeof(PHP_MANDIR)-1, CONST_PERSISTENT | CONST_CS);
+#endif
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_LIBDIR", PHP_LIBDIR, 
sizeof(PHP_LIBDIR)-1, CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_DATADIR", PHP_DATADIR, 
sizeof(PHP_DATADIR)-1, CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_SYSCONFDIR", PHP_SYSCONFDIR, 
sizeof(PHP_SYSCONFDIR)-1, CONST_PERSISTENT | CONST_CS);

Modified: php/php-src/trunk/main/main.c
===================================================================
--- php/php-src/trunk/main/main.c       2011-04-19 18:57:55 UTC (rev 310368)
+++ php/php-src/trunk/main/main.c       2011-04-19 21:43:22 UTC (rev 310369)
@@ -1863,7 +1863,13 @@
 #else
        php_os=PHP_OS;
 #endif
-
+       {
+               char dll_dir[MAX_PATH];
+               sprintf(dll_dir, "%s\\%s", module_path, "..\\..\\deps\\bin");
+               SetDllDirectory(dll_dir);
+       }
+//     GetModuleFileName (NULL, module_path, MAX_PATH);
+//__debugbreak();
 #ifdef ZTS
        tsrm_ls = ts_resource(0);
 #endif
@@ -1979,7 +1985,9 @@
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_EXTENSION_DIR", PHP_EXTENSION_DIR, 
sizeof(PHP_EXTENSION_DIR)-1, CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_PREFIX", PHP_PREFIX, 
sizeof(PHP_PREFIX)-1, CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_BINDIR", PHP_BINDIR, 
sizeof(PHP_BINDIR)-1, CONST_PERSISTENT | CONST_CS);
+#ifndef PHP_WIN32
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_MANDIR", PHP_MANDIR, 
sizeof(PHP_MANDIR)-1, CONST_PERSISTENT | CONST_CS);
+#endif
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_LIBDIR", PHP_LIBDIR, 
sizeof(PHP_LIBDIR)-1, CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_DATADIR", PHP_DATADIR, 
sizeof(PHP_DATADIR)-1, CONST_PERSISTENT | CONST_CS);
        REGISTER_MAIN_STRINGL_CONSTANT("PHP_SYSCONFDIR", PHP_SYSCONFDIR, 
sizeof(PHP_SYSCONFDIR)-1, CONST_PERSISTENT | CONST_CS);


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php