pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-03 13:36:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/EQEmu/Server

Browse Source 
Conflicts:
	common/debug.cpp
	common/debug.h
	zone/PlayerCorpse.cpp
	zone/beacon.cpp
	zone/client.cpp
	zone/net.cpp
	zone/tribute.cpp
This commit is contained in:
Arthur Ice
2013-05-19 16:19:22 -07:00
parent 3521472942 312100e1c6
commit fca9c1458b
618 changed files with 38296 additions and 39038 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/types.h
+17 -19
View File
@@ -1,19 +1,19 @@
/* EQEMu: Everquest Server Emulator
Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
/* EQEMu: Everquest Server Emulator
Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY except by those people which sell it, which
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY except by those people which sell it, which
are required to give you total support for your newly bought product;
without even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE. See the GNU General Public License for more details.
A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef TYPES_H
#define TYPES_H
@@ -32,11 +32,11 @@ typedef int64_t int64;
#else
typedef unsigned char byte;
typedef unsigned char uint8;
typedef signed char int8;
typedef signed char int8;
typedef unsigned short uint16;
typedef signed short int16;
typedef signed short int16;
typedef unsigned int uint32;
typedef signed int int32;
typedef signed int int32;
#ifdef _WINDOWS
#if defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64
@@ -54,7 +54,7 @@ typedef signed long long int64;
#endif
#ifdef _WINDOWS
#pragma warning( disable : 4200 )
#pragma warning( disable : 4200 )
#endif
#ifndef __cplusplus
@@ -69,9 +69,9 @@ typedef const char Const_char; //for perl XS
#ifdef _WINDOWS
#define snprintf _snprintf
#define strncasecmp _strnicmp
#define strcasecmp _stricmp
#define strcasecmp _stricmp
typedef void ThreadReturnType;
#define THREAD_RETURN(x) _endthread(); return;
#define THREAD_RETURN(x) _endthread(); return;
#else
typedef void* ThreadReturnType;
#define THREAD_RETURN(x) return(x);
@@ -107,6 +107,4 @@ typedef const char Const_char; //for perl XS
#define DLLFUNC extern "C"
#endif
#endif