archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Make Windows compile again.

Browse source
This commit is contained in:
Andi Gutmans 2000-05-05 07:18:50 +00:00
parent 5db0f958c4
commit 198537b70f
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ext/rpc/com/COM.c
View file

@ -33,7 +33,7 @@
* Zeev * Zeev
*/ */
#if WIN32|WINNT #ifdef PHP_WIN32
#define _WIN32_DCOM #define _WIN32_DCOM
@ -41,6 +41,7 @@
#include "php_COM.h" #include "php_COM.h"
#include "zend_compile.h" #include "zend_compile.h"
#include "php_ini.h" #include "php_ini.h"
#include "php_reentrancy.h"
#include "objbase.h" #include "objbase.h"
#include "olestd.h" #include "olestd.h"
@ -182,9 +183,9 @@ static PHP_INI_MH(OnTypelibFileChange)
if (typelib_name_buffer[0]==';') { if (typelib_name_buffer[0]==';') {
continue; continue;
} }
typelib_name = strtok_r(typelib_name_buffer, "\r\n", &strtok_buf); /* get rid of newlines */ typelib_name = php_strtok_r(typelib_name_buffer, "\r\n", &strtok_buf); /* get rid of newlines */
typelib_name = strtok_r(typelib_name, "#", &strtok_buf); typelib_name = php_strtok_r(typelib_name, "#", &strtok_buf);
modifier = strtok_r(NULL, "#", &strtok_buf); modifier = php_strtok_r(NULL, "#", &strtok_buf);
if (modifier) { if (modifier) {
if (!strcmp(modifier, "cis") || !strcmp(modifier, "case_insensitive")) { if (!strcmp(modifier, "cis") || !strcmp(modifier, "case_insensitive")) {
mode &= ~CONST_CS; mode &= ~CONST_CS;

5
sapi/cgi/cgi_main.c
View file

@ -47,6 +47,7 @@
#include <locale.h> #include <locale.h>
#endif #endif
#include "zend.h" #include "zend.h"
#include "zend_extensions.h"
#include "php_ini.h" #include "php_ini.h"
#include "php_globals.h" #include "php_globals.h"
#include "main.h" #include "main.h"
@ -317,13 +318,15 @@ static void define_command_line_ini_entry(char *arg)
void php_register_command_line_global_vars(char **arg) void php_register_command_line_global_vars(char **arg)
{ {
char *var, *val; char *var, *val;
ELS_FETCH();
PLS_FETCH();
var = *arg; var = *arg;
val = strchr(var, '='); val = strchr(var, '=');
if (!val) { if (!val) {
printf("No value specified for variable '%s'\n", var); printf("No value specified for variable '%s'\n", var);
} else { } else {
*val++ = NULL; *val++ = '\0';
php_register_variable(var, val, NULL ELS_CC PLS_CC); php_register_variable(var, val, NULL ELS_CC PLS_CC);
} }
efree(*arg); efree(*arg);