View | Details | Raw Unified | Return to issue 25590
Collapse All | Expand All

(-)ooo_1.1.0_src.orig/unixODBC/inc/sqltypes.h (-4 / +25 lines)
Lines 30-35 Link Here
30
extern "C" {
30
extern "C" {
31
#endif
31
#endif
32
32
33
#ifndef SIZEOF_LONG
34
# if defined(__alpha__) || defined(__x86_64__) || defined(__ia64__)
35
# define SIZEOF_LONG        8
36
#else
37
# define SIZEOF_LONG        4
38
#endif
39
#endif
40
33
/****************************
41
/****************************
34
 * These make up for having no windows.h
42
 * These make up for having no windows.h
35
 ***************************/
43
 ***************************/
Lines 47-53 Link Here
47
typedef void				VOID;
55
typedef void				VOID;
48
#endif
56
#endif
49
typedef unsigned short		WORD;
57
typedef unsigned short		WORD;
50
typedef unsigned long		DWORD;
58
#if SIZEOF_LONG == 4
59
	typedef unsigned long		DWORD;
60
#else
61
	typedef unsigned int		DWORD;
62
#endif
51
typedef unsigned char		BYTE;
63
typedef unsigned char		BYTE;
52
typedef unsigned short 		WCHAR;
64
typedef unsigned short 		WCHAR;
53
typedef WCHAR* 		        LPWSTR;
65
typedef WCHAR* 		        LPWSTR;
Lines 68-74 Link Here
68
typedef double          SQLFLOAT;
80
typedef double          SQLFLOAT;
69
#endif
81
#endif
70
82
71
typedef long            SQLINTEGER;
83
#if SIZEOF_LONG == 4
84
	typedef long	SQLINTEGER;
85
#else
86
	typedef int	SQLINTEGER;
87
#endif
72
88
73
#if (ODBCVER >= 0x0300)
89
#if (ODBCVER >= 0x0300)
74
typedef unsigned char   SQLNUMERIC;
90
typedef unsigned char   SQLNUMERIC;
Lines 114-122 Link Here
114
typedef unsigned char           UCHAR;
130
typedef unsigned char           UCHAR;
115
typedef signed char             SCHAR;
131
typedef signed char             SCHAR;
116
typedef SCHAR                   SQLSCHAR;
132
typedef SCHAR                   SQLSCHAR;
117
typedef long int                SDWORD;
133
#if SIZEOF_LONG == 4
134
	typedef long int		SDWORD;
135
	typedef unsigned long int	UDWORD;
136
#else
137
	typedef signed int	SDWORD;
138
	typedef unsigned int	UDWORD;
139
#endif
118
typedef signed short int        SWORD;
140
typedef signed short int        SWORD;
119
typedef unsigned long int       UDWORD;
120
typedef unsigned short int      UWORD;
141
typedef unsigned short int      UWORD;
121
typedef UDWORD                  SQLUINTEGER;
142
typedef UDWORD                  SQLUINTEGER;
122
typedef signed long             SLONG;
143
typedef signed long             SLONG;

Return to issue 25590