diff options
| author | Sterling Hughes <sterling@php.net> | 2003-06-23 01:10:58 +0000 |
|---|---|---|
| committer | Sterling Hughes <sterling@php.net> | 2003-06-23 01:10:58 +0000 |
| commit | d4cd1ef0843d0ef118cec86fa585517ac91d9cac (patch) | |
| tree | 0e774c02c135aaa82759646ec1cd0f3344136b42 /ext/mysql/libmysql/my_realloc.c | |
| parent | d520d2b80547add648fe678c4b61de815746f40a (diff) | |
| download | php-git-d4cd1ef0843d0ef118cec86fa585517ac91d9cac.tar.gz | |
remove the bundled libmysql, and update the config.m4 file as necessary.
this works locally, but everyone, *please* test
Diffstat (limited to 'ext/mysql/libmysql/my_realloc.c')
| -rw-r--r-- | ext/mysql/libmysql/my_realloc.c | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/ext/mysql/libmysql/my_realloc.c b/ext/mysql/libmysql/my_realloc.c deleted file mode 100644 index 7e85c1c861..0000000000 --- a/ext/mysql/libmysql/my_realloc.c +++ /dev/null @@ -1,51 +0,0 @@ -/* Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB -This file is public domain and comes with NO WARRANTY of any kind */ - -#ifdef SAFEMALLOC /* We don't need SAFEMALLOC here */ -#undef SAFEMALLOC -#endif - -#include "mysys_priv.h" -#include "mysys_err.h" - - /* My memory re allocator */ - -gptr my_realloc(gptr oldpoint, uint Size, myf MyFlags) -{ - gptr point; - DBUG_ENTER("my_realloc"); - DBUG_PRINT("my",("ptr: %lx Size: %u MyFlags: %d",oldpoint, Size, MyFlags)); - - if (!oldpoint && (MyFlags & MY_ALLOW_ZERO_PTR)) - DBUG_RETURN(my_malloc(Size,MyFlags)); -#ifdef USE_HALLOC - if (!(point = malloc(Size))) - { - if (MyFlags & MY_FREE_ON_ERROR) - my_free(oldpoint,MyFlags); - if (MyFlags & MY_HOLD_ON_ERROR) - DBUG_RETURN(oldpoint); - my_errno=errno; - if (MyFlags & MY_FAE+MY_WME) - my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG),Size); - } - else - { - memcpy(point,oldpoint,Size); - free(oldpoint); - } -#else - if ((point = (char*)realloc(oldpoint,Size)) == NULL) - { - if (MyFlags & MY_FREE_ON_ERROR) - my_free(oldpoint,MyFLAGS); - if (MyFlags & MY_HOLD_ON_ERROR) - DBUG_RETURN(oldpoint); - my_errno=errno; - if (MyFlags & (MY_FAE+MY_WME)) - my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG), Size); - } -#endif - DBUG_PRINT("exit",("ptr: %lx",point)); - DBUG_RETURN(point); -} /* my_realloc */ |