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

(-)inc/iodbcunix.h (+2 lines)
Lines 98-105 Link Here
98
#define PASCAL
98
#define PASCAL
99
#define VOID			void
99
#define VOID			void
100
#define CALLBACK
100
#define CALLBACK
101
#ifndef OS2
101
#define _cdecl
102
#define _cdecl
102
#define __stdcall
103
#define __stdcall
104
#endif
103
105
104
106
105
/*
107
/*
(-)inc/sqltypes.h (-1 / +8 lines)
Lines 106-111 Link Here
106
106
107
#ifdef WIN32
107
#ifdef WIN32
108
#define SQL_API	__stdcall
108
#define SQL_API	__stdcall
109
#elif defined(OS2)
110
#define SQL_API _System
109
#else
111
#else
110
#define SQL_API
112
#define SQL_API
111
#endif
113
#endif
Lines 192-204 Link Here
192
/*
194
/*
193
 *  Window Handle
195
 *  Window Handle
194
 */
196
 */
195
#if defined(WIN32) || defined (_WIN64) || defined(OS2)
197
#if defined(WIN32) || defined (_WIN64)
196
typedef void*			HWND;	/* Make up for no windows.h */
198
typedef void*			HWND;	/* Make up for no windows.h */
197
typedef HWND			SQLHWND;
199
typedef HWND			SQLHWND;
198
#elif defined(macintosh)
200
#elif defined(macintosh)
199
#include <Dialogs.h>
201
#include <Dialogs.h>
200
typedef WindowPtr 		HWND;
202
typedef WindowPtr 		HWND;
201
typedef HWND 			SQLHWND;
203
typedef HWND 			SQLHWND;
204
#elif defined(OS2)
205
#ifndef _OS2_H // YD define only if system headers are not included
206
typedef SQLPOINTER 		HWND;
207
#endif
208
typedef SQLPOINTER 		SQLHWND;
202
#else
209
#else
203
typedef SQLPOINTER 		HWND;
210
typedef SQLPOINTER 		HWND;
204
typedef SQLPOINTER 		SQLHWND;
211
typedef SQLPOINTER 		SQLHWND;

Return to issue 118582