mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-17 07:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace some defines with more portable ones.

Browse source
This commit is contained in:
derex 2008-10-16 21:38:42 +03:00
parent 58a1dd7209
commit 2073ab6365
2 changed files with 74 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

254
src/framework/Platform/Define.h
View file

@ -19,211 +19,103 @@
#ifndef MANGOS_DEFINE_H #ifndef MANGOS_DEFINE_H
#define MANGOS_DEFINE_H #define MANGOS_DEFINE_H
#include "Platform/CompilerDefs.h"
#include <sys/types.h> #include <sys/types.h>
/* Endian detection code from sha2.c: #include <ace/Basic_Types.h>
------------------------------------------------------------------------- #include <ace/ACE_export.h>
Copyright (c) 2001, Dr Brian Gladman <brg@gladman.me.uk>, Worcester, UK.
All rights reserved.
TERMS #include "Platform/CompilerDefs.h"
Redistribution and use in source and binary forms, with or without
modification, are permitted subject to the following conditions:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. The copyright holder's name must not be used to endorse or promote
any products derived from this software without his specific prior
written permission.
This software is provided 'as is' with no express or implied warranties
of correctness or fitness for purpose.
-------------------------------------------------------------------------
*/
/* 1. PLATFORM SPECIFIC INCLUDES */
#if defined(__GNU_LIBRARY__)
# include <endian.h>
# include <byteswap.h>
#elif defined(__CRYPTLIB__)
# if defined( INC_ALL )
# include "crypt.h"
# elif defined( INC_CHILD )
# include "../crypt.h"
# else
# include "crypt.h"
# endif
# if defined(DATA_LITTLEENDIAN)
# define PLATFORM_BYTE_ORDER SHA_LITTLE_ENDIAN
# else
# define PLATFORM_BYTE_ORDER SHA_BIG_ENDIAN
# endif
#elif defined(_MSC_VER)
# include <stdlib.h>
#elif !defined(WIN32)
# include <stdlib.h>
# if !defined (_ENDIAN_H)
# include <sys/param.h>
# else
# include _ENDIAN_H
# endif
#endif
/* 2. BYTE ORDER IN 32-BIT WORDS
To obtain the highest speed on processors with 32-bit words, this code
needs to determine the order in which bytes are packed into such words.
The following block of code is an attempt to capture the most obvious
ways in which various environemnts specify their endian definitions.
It may well fail, in which case the definitions will need to be set by
editing at the points marked **** EDIT HERE IF NECESSARY **** below.
*/
#define MANGOS_LITTLEENDIAN 0 #define MANGOS_LITTLEENDIAN 0
#define MANGOS_BIGENDIAN 1 #define MANGOS_BIGENDIAN 1
#if !defined(MANGOS_ENDIAN) #if !defined(MANGOS_ENDIAN)
# if defined(LITTLE_ENDIAN) || defined(BIG_ENDIAN) # if ACE_BYTE_ORDER == ACE_BIG_ENDIAN
# if defined(LITTLE_ENDIAN) && defined(BIG_ENDIAN)
# if defined(BYTE_ORDER)
# if (BYTE_ORDER == LITTLE_ENDIAN)
# define MANGOS_ENDIAN MANGOS_LITTLEENDIAN
# elif (BYTE_ORDER == BIG_ENDIAN)
# define MANGOS_ENDIAN MANGOS_BIGENDIAN
# endif
# endif
# elif defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN)
# define MANGOS_ENDIAN MANGOS_LITTLEENDIAN
# elif !defined(LITTLE_ENDIAN) && defined(BIG_ENDIAN)
# define MANGOS_ENDIAN MANGOS_BIGENDIAN
# endif
# elif defined(_LITTLE_ENDIAN) || defined(_BIG_ENDIAN)
# if defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN)
# if defined(_BYTE_ORDER)
# if (_BYTE_ORDER == _LITTLE_ENDIAN)
# define MANGOS_ENDIAN MANGOS_LITTLEENDIAN
# elif (_BYTE_ORDER == _BIG_ENDIAN)
# define MANGOS_ENDIAN MANGOS_BIGENDIAN
# endif
# endif
# elif defined(_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN)
# define MANGOS_ENDIAN MANGOS_LITTLE_ENDIAN
# elif !defined(_LITTLE_ENDIAN) && defined(_BIG_ENDIAN)
# define MANGOS_ENDIAN MANGOS_BIGENDIAN
# endif
# elif 0 /* **** EDIT HERE IF NECESSARY **** */
# define MANGOS_ENDIAN MANGOS_LITTLEENDIAN
# elif 0 /* **** EDIT HERE IF NECESSARY **** */
# define MANGOS_ENDIAN MANGOS_BIGENDIAN # define MANGOS_ENDIAN MANGOS_BIGENDIAN
# elif (('1234' >> 24) == '1') # else //ACE_BYTE_ORDER != ACE_BIG_ENDIAN
# define MANGOS_ENDIAN MANGOS_LITTLEENDIAN # define MANGOS_ENDIAN MANGOS_LITTLEENDIAN
# elif (('4321' >> 24) == '1') # endif //ACE_BYTE_ORDER
# define MANGOS_ENDIAN MANGOS_BIGENDIAN #endif //MANGOS_ENDIAN
# else
# define MANGOS_ENDIAN MANGOS_LITTLEENDIAN
# endif
#endif
/* End of Endian detection code from sha2.c: */
#if PLATFORM == PLATFORM_WINDOWS #if PLATFORM == PLATFORM_WINDOWS
#define MANGOS_EXPORT __declspec(dllexport) # define MANGOS_EXPORT __declspec(dllexport)
#define MANGOS_LIBRARY_HANDLE HMODULE # define MANGOS_LIBRARY_HANDLE HMODULE
#define MANGOS_LOAD_LIBRARY(a) LoadLibrary(a) # define MANGOS_LOAD_LIBRARY(a) LoadLibrary(a)
#define MANGOS_CLOSE_LIBRARY FreeLibrary # define MANGOS_CLOSE_LIBRARY FreeLibrary
#define MANGOS_GET_PROC_ADDR GetProcAddress # define MANGOS_GET_PROC_ADDR GetProcAddress
#define MANGOS_IMPORT __cdecl # define MANGOS_IMPORT __cdecl
#define MANGOS_SCRIPT_EXT ".dll" # define MANGOS_SCRIPT_EXT ".dll"
#define MANGOS_SCRIPT_NAME "MaNGOSScript" # define MANGOS_SCRIPT_NAME "MaNGOSScript"
#else #else //PLATFORM != PLATFORM_WINDOWS
#define MANGOS_LIBRARY_HANDLE void* # define MANGOS_LIBRARY_HANDLE void*
#define MANGOS_EXPORT export # define MANGOS_EXPORT export
#define MANGOS_LOAD_LIBRARY(a) dlopen(a,RTLD_NOW) # define MANGOS_LOAD_LIBRARY(a) dlopen(a,RTLD_NOW)
#define MANGOS_CLOSE_LIBRARY dlclose # define MANGOS_CLOSE_LIBRARY dlclose
#define MANGOS_GET_PROC_ADDR dlsym # define MANGOS_GET_PROC_ADDR dlsym
# if defined(__APPLE_CC__) && defined(BIG_ENDIAN)
# define MANGOS_IMPORT __attribute__ ((longcall))
# else
# define MANGOS_IMPORT __attribute__ ((cdecl))
# endif //__APPLE_CC__ && BIG_ENDIAN
# define MANGOS_SCRIPT_EXT ".so"
# define MANGOS_SCRIPT_NAME "libmangosscript"
#endif //PLATFORM
#if defined(__APPLE_CC__) && defined(BIG_ENDIAN) #if PLATFORM == PLATFORM_WINDOWS
#define MANGOS_IMPORT __attribute__ ((longcall)) # ifdef MANGOS_WIN32_DLL_IMPORT
#else # define MANGOS_DLL_DECL __declspec(dllimport)
#define MANGOS_IMPORT __attribute__ ((cdecl)) # else //!MANGOS_WIN32_DLL_IMPORT
#endif # ifdef MANGOS_WIND_DLL_EXPORT
# define MANGOS_DLL_DECL __declspec(dllexport)
#define MANGOS_SCRIPT_EXT ".so" # else //!MANGOS_WIND_DLL_EXPORT
#define MANGOS_SCRIPT_NAME "libmangosscript" # define MANGOS_DLL_DECL
#endif # endif //MANGOS_WIND_DLL_EXPORT
# endif //MANGOS_WIN32_DLL_IMPORT
#ifdef WIN32 #else //PLATFORM != PLATFORM_WINDOWS
#ifdef MANGOS_WIN32_DLL_IMPORT # define MANGOS_DLL_DECL
#endif //PLATFORM
#define MANGOS_DLL_DECL __declspec(dllimport)
#else
#ifdef MANGOS_WIND_DLL_EXPORT
#define MANGOS_DLL_DECL __declspec(dllexport)
#else
#define MANGOS_DLL_DECL
#endif
#endif
#else
#define MANGOS_DLL_DECL
#endif
#ifndef DEBUG
#define MANGOS_INLINE inline
#else
#ifndef MANGOS_DEBUG
#define MANGOS_DEBUG
#endif
#define MANGOS_INLINE
#endif
#if COMPILER == COMPILER_MICROSOFT
typedef __int64 int64;
typedef __int32 int32;
typedef __int16 int16;
typedef __int8 int8;
typedef unsigned __int64 uint64;
typedef unsigned __int32 uint32;
typedef unsigned __int16 uint16;
typedef unsigned __int8 uint8;
#else
typedef __int64_t int64;
typedef __int32_t int32;
typedef __int16_t int16;
typedef __int8_t int8;
typedef __uint64_t uint64;
typedef __uint32_t uint32;
typedef __uint16_t uint16;
typedef __uint8_t uint8;
typedef uint16 WORD;
typedef uint32 DWORD;
#endif
typedef uint64 OBJECT_HANDLE;
#if PLATFORM == PLATFORM_WINDOWS #if PLATFORM == PLATFORM_WINDOWS
# define MANGOS_DLL_SPEC __declspec(dllexport) # define MANGOS_DLL_SPEC __declspec(dllexport)
# ifndef DECLSPEC_NORETURN # ifndef DECLSPEC_NORETURN
# define DECLSPEC_NORETURN __declspec(noreturn) # define DECLSPEC_NORETURN __declspec(noreturn)
# endif # endif //DECLSPEC_NORETURN
#else #else //PLATFORM != PLATFORM_WINDOWS
# define MANGOS_DLL_SPEC # define MANGOS_DLL_SPEC
# define DECLSPEC_NORETURN # define DECLSPEC_NORETURN
#endif #endif //PLATFORM
#if !defined(DEBUG)
# define MANGOS_INLINE inline
#else //DEBUG
# if !defined(MANGOS_DEBUG)
# define MANGOS_DEBUG
# endif //MANGOS_DEBUG
# define MANGOS_INLINE
#endif //!DEBUG
#if COMPILER == COMPILER_GNU #if COMPILER == COMPILER_GNU
# define ATTR_NORETURN __attribute__((noreturn)) # define ATTR_NORETURN __attribute__((noreturn))
# define ATTR_PRINTF(F,V) __attribute__ ((format (printf, F, V))) # define ATTR_PRINTF(F,V) __attribute__ ((format (printf, F, V)))
#else #else //COMPILER != COMPILER_GNU
# define ATTR_NORETURN # define ATTR_NORETURN
# define ATTR_PRINTF(F,V) # define ATTR_PRINTF(F,V)
#endif #endif //COMPILER == COMPILER_GNU
#endif typedef ACE_INT64 int64;
typedef ACE_INT32 int32;
typedef ACE_INT16 int16;
typedef ACE_INT8 int8;
typedef ACE_UINT64 uint64;
typedef ACE_UINT32 uint32;
typedef ACE_UINT16 uint16;
typedef ACE_UINT8 uint8;
#if COMPILER != COMPILER_MICROSOFT
typedef uint16 WORD;
typedef uint32 DWORD;
#endif //COMPILER
typedef uint64 OBJECT_HANDLE;
#endif //MANGOS_DEFINE_H

2
src/realmd/AuthSocket.cpp
View file

@ -866,7 +866,7 @@ void PatcherRunnable::run()
/// Preload MD5 hashes of existing patch files on server /// Preload MD5 hashes of existing patch files on server
#ifndef _WIN32 #ifndef _WIN32
#include <sys/dir.h> #include <dirent.h>
#include <errno.h> #include <errno.h>
void Patcher::LoadPatchesInfo() void Patcher::LoadPatchesInfo()
{ {