database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Compilation failed on Debian 32-bit.

Browse Source 
Fixing DWORD definition once again as "unsigned long",
which is the way how MS defines it.

modified:
  @ storage/connect/os.h
    Changing DWORD defitition

  @ storage/connect/tabodbc.cpp
    Moving "#define NODW" to proper place.
This commit is contained in:
Alexander Barkov
2013-01-29 19:15:22 +04:00
parent d78d3d4fc9
commit ab76cdb236
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
storage/connect/os.h
View File

@@ -28,7 +28,13 @@ typedef char *LPTSTR;
typedef char *PSZ; typedef char *PSZ;
typedef int INT; typedef int INT;
#if !defined(NODW) #if !defined(NODW)
typedef unsigned int DWORD; /*
sqltypes.h from unixODBC incorrectly defines
DWORD as "unsigned int" instead of "unsigned long" on 64-bit platforms.
Add "#define NODW" into all files including this file that include
sqltypes.h (through sql.h or sqlext.h).
*/
typedef unsigned long DWORD;
#endif /* !NODW */ #endif /* !NODW */
#undef HANDLE #undef HANDLE
typedef int HANDLE; typedef int HANDLE;

2
storage/connect/tabodbc.cpp
View File

@@ -46,12 +46,12 @@
#else #else
#if defined(UNIX) #if defined(UNIX)
#include <errno.h> #include <errno.h>
#define NODW
#include "osutil.h" #include "osutil.h"
#else #else
#include <io.h> #include <io.h>
#endif #endif
#include <fcntl.h> #include <fcntl.h>
#define NODW
#endif #endif
/***********************************************************************/ /***********************************************************************/