diff options
| author | Andi Gutmans <andi@php.net> | 2000-08-22 17:59:35 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2000-08-22 17:59:35 +0000 |
| commit | 0222b7ab416d845abcd3925b3da47fa2d7ed238d (patch) | |
| tree | 38cbb73fda38196612fddffda4d803003a86b568 /ext/mysql/libmysql/dbug.c | |
| parent | 60676f19a5f5425c4375d8ba60e8bd07016ba562 (diff) | |
| download | php-git-0222b7ab416d845abcd3925b3da47fa2d7ed238d.tar.gz | |
- Try and revert libmysql for 4.0.2
Diffstat (limited to 'ext/mysql/libmysql/dbug.c')
| -rw-r--r-- | ext/mysql/libmysql/dbug.c | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/ext/mysql/libmysql/dbug.c b/ext/mysql/libmysql/dbug.c index c004de587f..8eb5fea5eb 100644 --- a/ext/mysql/libmysql/dbug.c +++ b/ext/mysql/libmysql/dbug.c @@ -72,7 +72,7 @@ #include <global.h> #include <m_string.h> #include <errno.h> -#if defined(MSDOS) || defined(__WIN__) +#if defined(MSDOS) || defined(__WIN32__) #include <process.h> #endif @@ -123,7 +123,7 @@ * Typedefs to make things more obvious. */ -#ifndef __WIN__ +#ifndef __WIN32__ typedef int BOOLEAN; #else #define BOOLEAN BOOL @@ -310,13 +310,11 @@ static char *static_strtok(char *s1,pchar chr); #if !defined(HAVE_ACCESS) || defined(MSDOS) #define EXISTS(pathname) (FALSE) /* Assume no existance */ #define Writable(name) (TRUE) +#define ChangeOwner(name) #else #define EXISTS(pathname) (access (pathname, F_OK) == 0) #define WRITABLE(pathname) (access (pathname, W_OK) == 0) #endif -#ifndef MSDOS -#define ChangeOwner(name) -#endif /* * Translate some calls among different systems. @@ -1057,20 +1055,20 @@ struct link *linkp; const char *cp; { REGISTER struct link *scan; - REGISTER BOOLEAN result; + REGISTER BOOLEAN accept; if (linkp == NULL) { - result = TRUE; + accept = TRUE; } else { - result = FALSE; + accept = FALSE; for (scan = linkp; scan != NULL; scan = scan -> next_link) { if (STREQ (scan -> str, cp)) { - result = TRUE; + accept = TRUE; break; } } } - return (result); + return (accept); } @@ -1219,20 +1217,20 @@ static BOOLEAN DoProfile () BOOLEAN _db_keyword_ (keyword) const char *keyword; { - REGISTER BOOLEAN result; + REGISTER BOOLEAN accept; CODE_STATE *state; if (!init_done) _db_push_ (""); state=code_state(); - result = FALSE; + accept = FALSE; if (DEBUGGING && state->level <= stack -> maxdepth && InList (stack -> functions, state->func) && InList (stack -> keywords, keyword) && InList (stack -> processes, _db_process_)) - result = TRUE; - return (result); + accept = TRUE; + return (accept); } /* @@ -1923,7 +1921,7 @@ static void dbug_flush(CODE_STATE *state) if (stack->flags & FLUSH_ON_WRITE) #endif { -#if defined(MSDOS) || defined(__WIN__) +#if defined(MSDOS) || defined(__WIN32__) if (_db_fp_ != stdout && _db_fp_ != stderr) { if (!(freopen(stack->name,"a",_db_fp_))) @@ -1990,7 +1988,7 @@ static unsigned long Clock () } #else -#if defined(MSDOS) || defined(__WIN__) +#if defined(MSDOS) || defined(__WIN32__) static ulong Clock() { @@ -2040,7 +2038,7 @@ static unsigned long Clock () } #endif #endif /* amiga */ -#endif /* MSDOS || __WIN__ */ +#endif /* MSDOS || __WIN32__ */ #endif /* RUSAGE */ |