Commit 7d0887e0 authored by Alexander Barkov's avatar Alexander Barkov

Moving duplicate data type declatations into os.h.

modified:
  storage/connect/global.h
  storage/connect/inihandl.c
  storage/connect/osutil.h
parent 780463cc
...@@ -136,35 +136,8 @@ extern "C" { ...@@ -136,35 +136,8 @@ extern "C" {
/***********************************************************************/ /***********************************************************************/
/* General purpose type definitions. */ /* General purpose type definitions. */
/***********************************************************************/ /***********************************************************************/
#if !defined(WIN32) #include "os.h"
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
typedef uint OFFSET; typedef uint OFFSET;
typedef char NAME[9]; typedef char NAME[9];
......
...@@ -35,8 +35,6 @@ ...@@ -35,8 +35,6 @@
// The types and variables used locally // The types and variables used locally
//typedef int bool; //typedef int bool;
typedef const char *LPCSTR;
typedef char *LPSTR;
typedef unsigned int uint; typedef unsigned int uint;
#define DWORD int #define DWORD int
#define TRUE 1 #define TRUE 1
......
...@@ -5,26 +5,8 @@ ...@@ -5,26 +5,8 @@
#include "my_global.h" #include "my_global.h"
#include <errno.h> #include <errno.h>
#include <stddef.h> #include <stddef.h>
#include "os.h"
typedef const void *LPCVOID;
typedef const char *LPCTSTR;
typedef const char *LPCSTR;
typedef unsigned char BYTE;
typedef char *LPSTR;
typedef char *LPTSTR;
typedef char *PSZ;
typedef int INT;
//typedef int DWORD;
#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 strnicmp strncasecmp
#define MB_OK 0x00000000 #define MB_OK 0x00000000
#if defined(__cplusplus) #if defined(__cplusplus)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment