diff options
author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 08:17:56 -0300 |
---|---|---|
committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-15 08:17:56 -0300 |
commit | bdab1de458317c2dc7074eb54cec908ca320272e (patch) | |
tree | 3aa253051eb3b21b8922b119547ba34b3aa746a3 /mysys | |
parent | 13f7a1d2447c002adc36dd1bd51305edbc8e8636 (diff) | |
download | mariadb-git-bdab1de458317c2dc7074eb54cec908ca320272e.tar.gz |
WL#5486: Remove code for unsupported platforms
Remove Zortech specific code.
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/mf_tempfile.c | 9 | ||||
-rw-r--r-- | mysys/mf_util.c | 47 | ||||
-rw-r--r-- | mysys/my_copy.c | 2 | ||||
-rw-r--r-- | mysys/my_redel.c | 2 |
4 files changed, 1 insertions, 59 deletions
diff --git a/mysys/mf_tempfile.c b/mysys/mf_tempfile.c index b5933dcc317..e85124fb4c3 100644 --- a/mysys/mf_tempfile.c +++ b/mysys/mf_tempfile.c @@ -100,15 +100,6 @@ File create_temp_file(char *to, const char *dir, const char *prefix, my_errno= tmp; } -#elif defined(_ZTC__) - if (!dir) - dir=getenv("TMPDIR"); - if ((res=tempnam((char*) dir,(char *) prefix))) - { - strmake(to,res,FN_REFLEN-1); - (*free)(res); - file=my_create(to, 0, mode | O_EXCL | O_NOFOLLOW, MyFlags); - } #elif defined(HAVE_MKSTEMP) { char prefix_buff[30]; diff --git a/mysys/mf_util.c b/mysys/mf_util.c deleted file mode 100644 index 248b72b8748..00000000000 --- a/mysys/mf_util.c +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright (C) 2000 MySQL AB - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; version 2 of the License. - - This program 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - -/* Utilities with are missing on some systems */ - -#include "mysys_priv.h" -#ifdef __ZTC__ -#include <dos.h> -#endif - -#ifdef __ZTC__ - - /* On ZORTECH C we don't have a getpid() call */ - -int getpid(void) -{ - return (int) _psp; -} - -#ifndef M_IC80386 - - /* Define halloc and hfree in as in MSC */ - -void * __CDECL halloc(long count,size_t length) -{ - return (void*) MK_FP(dos_alloc((uint) ((count*length+15) >> 4)),0); -} - -void __CDECL hfree(void *ptr) -{ - dos_free(FP_SEG(ptr)); -} - -#endif /* M_IC80386 */ -#endif /* __ZTC__ */ diff --git a/mysys/my_copy.c b/mysys/my_copy.c index a6811694fe1..96d7547c90e 100644 --- a/mysys/my_copy.c +++ b/mysys/my_copy.c @@ -106,7 +106,7 @@ int my_copy(const char *from, const char *to, myf MyFlags) #if !defined(__WIN__) res= chown(to, stat_buff.st_uid,stat_buff.st_gid); /* Copy ownership */ #endif -#if !defined(VMS) && !defined(__ZTC__) +#if !defined(VMS) if (MyFlags & MY_COPYTIME) { struct utimbuf timep; diff --git a/mysys/my_redel.c b/mysys/my_redel.c index 515e5cab1eb..0ec329a608b 100644 --- a/mysys/my_redel.c +++ b/mysys/my_redel.c @@ -101,7 +101,6 @@ int my_copystat(const char *from, const char *to, int MyFlags) #endif /* !__WIN__ */ #ifndef VMS -#ifndef __ZTC__ if (MyFlags & MY_COPYTIME) { struct utimbuf timep; @@ -118,6 +117,5 @@ int my_copystat(const char *from, const char *to, int MyFlags) (void) utime((char*) to, time);/* Update last accessed and modified times */ } #endif -#endif return 0; } /* my_copystat */ |