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/my_open.c | |
| parent | 60676f19a5f5425c4375d8ba60e8bd07016ba562 (diff) | |
| download | php-git-0222b7ab416d845abcd3925b3da47fa2d7ed238d.tar.gz | |
- Try and revert libmysql for 4.0.2
Diffstat (limited to 'ext/mysql/libmysql/my_open.c')
| -rw-r--r-- | ext/mysql/libmysql/my_open.c | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/ext/mysql/libmysql/my_open.c b/ext/mysql/libmysql/my_open.c index ef1db41e3f..10ddb95388 100644 --- a/ext/mysql/libmysql/my_open.c +++ b/ext/mysql/libmysql/my_open.c @@ -1,25 +1,11 @@ -/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ +/* Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB + This file is public domain and comes with NO WARRANTY of any kind */ #define USES_TYPES #include "mysys_priv.h" #include "mysys_err.h" #include <errno.h> -#if defined(MSDOS) || defined(__WIN__) +#if defined(MSDOS) || defined(__WIN32__) #include <share.h> #endif @@ -34,7 +20,7 @@ File my_open(const char *FileName, int Flags, myf MyFlags) DBUG_ENTER("my_open"); DBUG_PRINT("my",("Name: '%s' Flags: %d MyFlags: %d", FileName, Flags, MyFlags)); -#if defined(MSDOS) || defined(__WIN__) +#if defined(MSDOS) || defined(__WIN32__) if (Flags & O_SHARE) fd = sopen((my_string) FileName, (Flags & ~O_SHARE) | O_BINARY, SH_DENYNO); else @@ -86,7 +72,7 @@ int my_close(File fd, myf MyFlags) if (MyFlags & (MY_FAE | MY_WME)) my_error(EE_BADCLOSE, MYF(ME_BELL+ME_WAITTANG),my_filename(fd),errno); } - if ((uint) fd < MY_NFILE && my_file_info[fd].type != UNOPEN) + if (fd < MY_NFILE && my_file_info[fd].type != UNOPEN) { my_file_opened--; my_free(my_file_info[fd].name, MYF(0)); |