diff options
author | unknown <reggie@big_geek.> | 2006-05-08 14:50:13 -0500 |
---|---|---|
committer | unknown <reggie@big_geek.> | 2006-05-08 14:50:13 -0500 |
commit | ec82432941f7f6ef3d60b8d578883633dcaa6f26 (patch) | |
tree | dd3df64649d7ead588a0df258156657b5c8ddd41 /include | |
parent | d9c1d25882f856ea6ad5afada171b7e0d1b3bcd4 (diff) | |
download | mariadb-git-ec82432941f7f6ef3d60b8d578883633dcaa6f26.tar.gz |
removing MSDOS defines and code
include/config-win.h:
removed reference to MSDOS
Diffstat (limited to 'include')
-rw-r--r-- | include/config-win.h | 2 | ||||
-rw-r--r-- | include/m_string.h | 6 | ||||
-rw-r--r-- | include/my_base.h | 3 | ||||
-rw-r--r-- | include/my_net.h | 4 | ||||
-rw-r--r-- | include/my_nosys.h | 3 | ||||
-rw-r--r-- | include/my_sys.h | 16 | ||||
-rw-r--r-- | include/my_tree.h | 8 |
7 files changed, 3 insertions, 39 deletions
diff --git a/include/config-win.h b/include/config-win.h index b6fb1077cc6..345fb2221de 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -95,7 +95,7 @@ functions */ #define O_SHORT_LIVED 0 #define SH_DENYNO _SH_DENYNO #else -#define O_BINARY _O_BINARY /* compability with MSDOS */ +#define O_BINARY _O_BINARY /* compability with older style names */ #define FILE_BINARY _O_BINARY /* my_fopen in binary mode */ #define O_TEMPORARY _O_TEMPORARY #define O_SHORT_LIVED _O_SHORT_LIVED diff --git a/include/m_string.h b/include/m_string.h index 8b23d765e91..03683552e7a 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -119,12 +119,6 @@ extern char NEAR _dig_vec_lower[]; #define memcpy_fixed(A,B,C) memcpy((A),(B),(C)) #endif -#ifdef MSDOS -#undef bmove_align -#define bmove512(A,B,C) bmove_align(A,B,C) -extern void bmove_align(gptr dst,const gptr src,uint len); -#endif - #if (!defined(USE_BMOVE512) || defined(HAVE_purify)) && !defined(bmove512) #define bmove512(A,B,C) memcpy(A,B,C) #endif diff --git a/include/my_base.h b/include/my_base.h index b9a806cc02f..7ae86edfe17 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -33,9 +33,6 @@ #define EOVERFLOW 84 #endif -#ifdef MSDOS -#include <share.h> /* Neaded for sopen() */ -#endif #if !defined(USE_MY_FUNC) && !defined(THREAD) #include <my_nosys.h> /* For faster code, after test */ #endif /* USE_MY_FUNC */ diff --git a/include/my_net.h b/include/my_net.h index f953a832e6b..b26e525016b 100644 --- a/include/my_net.h +++ b/include/my_net.h @@ -44,7 +44,7 @@ C_MODE_START #include <sys/ioctl.h> #endif -#if !defined(MSDOS) && !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__) && !defined(__NETWARE__) +#if !defined(__WIN__) && !defined(HAVE_BROKEN_NETINET_INCLUDES) && !defined(__BEOS__) && !defined(__NETWARE__) #include <netinet/in_systm.h> #include <netinet/in.h> #include <netinet/ip.h> @@ -53,7 +53,7 @@ C_MODE_START #endif #endif -#if defined(MSDOS) || defined(__WIN__) +#if defined(__WIN__) #define O_NONBLOCK 1 /* For emulation of fcntl() */ #endif diff --git a/include/my_nosys.h b/include/my_nosys.h index 605906f0e07..41b919c1a72 100644 --- a/include/my_nosys.h +++ b/include/my_nosys.h @@ -27,9 +27,6 @@ extern "C" { #ifndef __MY_NOSYS__ #define __MY_NOSYS__ -#ifdef MSDOS -#include <io.h> /* Get prototypes for read()... */ -#endif #ifndef HAVE_STDLIB_H #include <malloc.h> #endif diff --git a/include/my_sys.h b/include/my_sys.h index 26bf31ae10d..7a243013719 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -196,22 +196,6 @@ extern void my_large_free(gptr ptr, myf my_flags); #define my_afree(PTR) my_free(PTR,MYF(MY_WME)) #endif /* HAVE_ALLOCA */ -#ifdef MSDOS -#ifdef __ZTC__ -void * __CDECL halloc(long count,size_t length); -void __CDECL hfree(void *ptr); -#endif -#if defined(USE_HALLOC) -#if defined(_VCM_) || defined(M_IC80386) -#undef USE_HALLOC -#endif -#endif -#ifdef USE_HALLOC -#define malloc(a) halloc((long) (a),1) -#define free(a) hfree(a) -#endif -#endif /* MSDOS */ - #ifndef errno /* did we already get it? */ #ifdef HAVE_ERRNO_AS_DEFINE #include <errno.h> /* errno is a define */ diff --git a/include/my_tree.h b/include/my_tree.h index 14d8593b6dc..745500f06e9 100644 --- a/include/my_tree.h +++ b/include/my_tree.h @@ -40,19 +40,11 @@ typedef int (*tree_walk_action)(void *,element_count,void *); typedef enum { free_init, free_free, free_end } TREE_FREE; typedef void (*tree_element_free)(void*, TREE_FREE, void *); -#ifdef MSDOS -typedef struct st_tree_element { - struct st_tree_element *left,*right; - unsigned long count; - uchar colour; /* black is marked as 1 */ -} TREE_ELEMENT; -#else typedef struct st_tree_element { struct st_tree_element *left,*right; uint32 count:31, colour:1; /* black is marked as 1 */ } TREE_ELEMENT; -#endif /* MSDOS */ #define ELEMENT_CHILD(element, offs) (*(TREE_ELEMENT**)((char*)element + offs)) |