From 312100e1c60c69e286f2ba99d8bf423f7e160787 Mon Sep 17 00:00:00 2001 From: KimLS Date: Wed, 15 May 2013 14:37:30 -0700 Subject: [PATCH] Azone fix for new compilers and possible fix for x64 --- utils/azone2/global.hpp | 8 ++------ utils/azone2/types.h | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/utils/azone2/global.hpp b/utils/azone2/global.hpp index 968ac4825..9f099ddea 100644 --- a/utils/azone2/global.hpp +++ b/utils/azone2/global.hpp @@ -9,12 +9,8 @@ #include #endif -#ifndef nullptr -#define nullptr 0 -#endif - -typedef unsigned long uint32; -typedef long int32; +typedef unsigned int uint32; +typedef int int32; typedef unsigned short uint16; typedef short int16; diff --git a/utils/azone2/types.h b/utils/azone2/types.h index f3d6c3016..af02137af 100644 --- a/utils/azone2/types.h +++ b/utils/azone2/types.h @@ -1,8 +1,8 @@ #ifndef __EQCLIENT_TYPES_H_ #define __EQCLIENT_TYPES_H_ -typedef unsigned long uint32; -typedef long int32; +typedef unsigned int uint32; +typedef int int32; typedef unsigned short uint16; typedef short int16;