8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 06:03:02 +01:00

-Remove BOOLEAN_DEFINED macro

-Remove MSG_DEFINED macro
This commit is contained in:
brodsom 2003-08-28 22:52:19 +00:00
parent 6f7827d544
commit 255b32204e
5 changed files with 1 additions and 27 deletions

View File

@ -49,7 +49,7 @@
*
*/
/*
$Id: common.h,v 1.78 2003-08-28 13:14:37 brodsom Exp $
$Id: common.h,v 1.79 2003-08-28 22:52:19 brodsom Exp $
*/
#ifndef JRD_COMMON_H
@ -608,9 +608,6 @@ typedef unsigned __int64 UINT64;
#define DLL_EXPORT
#endif
//#define BOOLEAN_DEFINED
//typedef unsigned char BOOLEAN;
#ifndef MAXPATHLEN
#ifdef MAX_PATH
#define MAXPATHLEN MAX_PATH
@ -764,14 +761,6 @@ typedef unsigned long UATOM;
#undef ATOM_DEFINED
#endif
/*
#ifndef BOOLEAN_DEFINED
typedef USHORT BOOLEAN;
#else
#undef BOOLEAN_DEFINED
#endif
*/
#ifndef ISC_TIMESTAMP_DEFINED
typedef SLONG ISC_DATE;
typedef ULONG ISC_TIME;

View File

@ -27,9 +27,6 @@
#include <prsht.h>
#include <dbt.h>
#define BOOLEAN_DEFINED
#define MSG_DEFINED
#include "../jrd/common.h"
#include "../jrd/isc.h"
#include "../jrd/file_params.h"

View File

@ -39,9 +39,6 @@
#error This is a Win32 only file.
#endif
#define BOOLEAN_DEFINED
#define MSG_DEFINED
#include "../jrd/common.h"
#include "../jrd/license.h"
#include "../jrd/isc.h"

View File

@ -23,9 +23,6 @@
#include <prsht.h>
#include <dbt.h>
#define BOOLEAN_DEFINED
#define MSG_DEFINED
#include "../jrd/common.h"
#include "../jrd/license.h"
#include "../jrd/isc.h"

View File

@ -24,14 +24,8 @@
#include "firebird.h"
#include <windows.h>
#include <string.h>
#define MSG_DEFINED
#include "../remote/remote.h"
#include "../remote/serve_proto.h"
/*
* We need to seperate modules that use windows.h from those that
* use remote.h since both header files define conflicting MSG types.
* The MSG_DEFINED flag is used to not define the MSG type in remote.h
*/
#include "../jrd/common.h"
#include <winsock2.h>