summaryrefslogtreecommitdiff
path: root/storage/connect/global.h
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mnogosearch.org>2013-01-29 21:14:59 +0400
committerAlexander Barkov <bar@mnogosearch.org>2013-01-29 21:14:59 +0400
commit7d0887e0d81ba59b6fdf567def09ea571b795721 (patch)
treec7dbead8876825e894303e2584a51ae40fff41e1 /storage/connect/global.h
parent780463cc252d23b90184bfe1986dd5851fe760a5 (diff)
downloadmariadb-git-7d0887e0d81ba59b6fdf567def09ea571b795721.tar.gz
Moving duplicate data type declatations into os.h.
modified: storage/connect/global.h storage/connect/inihandl.c storage/connect/osutil.h
Diffstat (limited to 'storage/connect/global.h')
-rw-r--r--storage/connect/global.h31
1 files changed, 2 insertions, 29 deletions
diff --git a/storage/connect/global.h b/storage/connect/global.h
index 3b8e11d34d5..76c0fcb776f 100644
--- a/storage/connect/global.h
+++ b/storage/connect/global.h
@@ -136,35 +136,8 @@ extern "C" {
/***********************************************************************/
/* General purpose type definitions. */
/***********************************************************************/
-#if !defined(WIN32)
-typedef const char *LPCTSTR;
-typedef const char *LPCSTR;
-typedef unsigned char BYTE;
-typedef char *LPSTR;
-typedef char *PSZ;
-#if !defined(NODW)
-typedef unsigned int DWORD;
-#endif // !NODW
-#undef HANDLE
-typedef int HANDLE;
-#ifdef __cplusplus
-typedef int bool;
-#else
-#define bool my_bool
-#endif
-#define _MAX_PATH PATH_MAX
-#define stricmp strcasecmp
-#define _stricmp strcasecmp
-#define strnicmp strncasecmp
-#define _strnicmp strncasecmp
-#define _MAX_PATH 260
-#define _MAX_DRIVE 3
-#define _MAX_DIR 256
-#define _MAX_FNAME 256
-#define _MAX_EXT 256
-#define INVALID_HANDLE_VALUE (-1)
-#define __stdcall
-#endif // !WIN32
+#include "os.h"
+
typedef uint OFFSET;
typedef char NAME[9];