Browse Source

backport 59444347 and 3d7343f6

pull/2126/head
Anatol Belski 10 years ago
parent
commit
b1f33db39f
  1. 4
      sapi/cgi/cgi_main.c
  2. 4
      sapi/cli/php_cli.c
  3. 4
      sapi/phpdbg/phpdbg.c

4
sapi/cgi/cgi_main.c

@ -92,6 +92,10 @@ int __riscosify_control = __RISCOSIFY_STRICT_UNIX_SPECS;
#include "fastcgi.h"
#if defined(PHP_WIN32) && defined(HAVE_OPENSSL)
# include "openssl/applink.c"
#endif
#ifndef PHP_WIN32
/* XXX this will need to change later when threaded fastcgi is implemented. shane */
struct sigaction act, old_term, old_quit, old_int;

4
sapi/cli/php_cli.c

@ -95,6 +95,10 @@
# include "win32/select.h"
#endif
#if defined(PHP_WIN32) && defined(HAVE_OPENSSL)
# include "openssl/applink.c"
#endif
PHPAPI extern char *php_ini_opened_path;
PHPAPI extern char *php_ini_scanned_path;
PHPAPI extern char *php_ini_scanned_files;

4
sapi/phpdbg/phpdbg.c

@ -41,6 +41,10 @@
# include <arpa/inet.h>
#endif /* }}} */
#if defined(PHP_WIN32) && defined(HAVE_OPENSSL)
# include "openssl/applink.c"
#endif
ZEND_DECLARE_MODULE_GLOBALS(phpdbg);
static zend_bool phpdbg_booted = 0;

Loading…
Cancel
Save