forked from 0ad/0ad
types.h => lib/types.h (avoid name collision)
This was SVN commit r1935.
This commit is contained in:
parent
3eb6d152d6
commit
e6c8cef293
@ -1,6 +1,6 @@
|
||||
#include "precompiled.h"
|
||||
|
||||
#include "types.h"
|
||||
#include "lib/types.h"
|
||||
#include "MapReader.h"
|
||||
#include "UnitManager.h"
|
||||
#include "Unit.h"
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include "precompiled.h"
|
||||
|
||||
#include "types.h"
|
||||
#include "lib/types.h"
|
||||
#include "MapWriter.h"
|
||||
#include "UnitManager.h"
|
||||
#include "Unit.h"
|
||||
|
@ -27,7 +27,7 @@ gee@pyro.nu
|
||||
|
||||
#include "Pyrogenesis.h"
|
||||
#include "CStr.h"
|
||||
#include "types.h"
|
||||
#include "lib/types.h"
|
||||
#include "ogl.h"
|
||||
|
||||
#include "GUIbase.h"
|
||||
|
@ -8,7 +8,7 @@
|
||||
#include "res/file.h"
|
||||
#include "res/mem.h"
|
||||
#include "scripting/ScriptingHost.h"
|
||||
#include "types.h"
|
||||
#include "lib/types.h"
|
||||
|
||||
#define LOG_CATEGORY "config"
|
||||
|
||||
|
@ -10,7 +10,7 @@
|
||||
#define _FILEUNPACKER_H
|
||||
|
||||
#include <vector>
|
||||
#include "types.h"
|
||||
#include "lib/types.h"
|
||||
#include "CStr.h"
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -1,7 +1,7 @@
|
||||
#ifndef _AllNetMessages_H
|
||||
#define _AllNetMessages_H
|
||||
|
||||
#include "types.h"
|
||||
#include "lib/types.h"
|
||||
#include "CStr.h"
|
||||
#include "scripting/JSSerialization.h"
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#ifndef _NetMessage_H
|
||||
#define _NetMessage_H
|
||||
|
||||
#include "types.h"
|
||||
#include "lib/types.h"
|
||||
#include "Serialization.h"
|
||||
#include "Network/SocketBase.h"
|
||||
|
||||
|
@ -46,7 +46,7 @@ MORE INFO
|
||||
//--------------------------------------------------------
|
||||
|
||||
#include "posix.h"
|
||||
#include "types.h"
|
||||
#include "lib/types.h"
|
||||
#include "Pyrogenesis.h"
|
||||
#include "ThreadUtil.h"
|
||||
#include "Singleton.h"
|
||||
|
@ -1,7 +1,7 @@
|
||||
#ifndef _Serialization_H
|
||||
#define _Serialization_H
|
||||
|
||||
#include "types.h"
|
||||
#include "lib/types.h"
|
||||
#include "lib.h"
|
||||
|
||||
#define Serialize_int_1(_pos, _val) \
|
||||
|
@ -6,7 +6,7 @@
|
||||
//--------------------------------------------------------
|
||||
|
||||
#include "posix.h"
|
||||
#include "types.h"
|
||||
#include "lib/types.h"
|
||||
#include "Pyrogenesis.h"
|
||||
#include <string.h>
|
||||
#include "CStr.h"
|
||||
|
@ -1,7 +1,7 @@
|
||||
#ifndef _StreamSocket_H
|
||||
#define _StreamSocket_H
|
||||
|
||||
#include "types.h"
|
||||
#include "lib/types.h"
|
||||
#include "Pyrogenesis.h"
|
||||
#include "Network.h"
|
||||
#include "SocketBase.h"
|
||||
|
@ -17,7 +17,7 @@ typedef std::wstringstream utf16stringstream;
|
||||
#else
|
||||
|
||||
#include <string>
|
||||
#include "types.h"
|
||||
#include "lib/types.h"
|
||||
|
||||
typedef uint16_t utf16_t;
|
||||
typedef std::basic_string<utf16_t> utf16string;
|
||||
|
@ -20,7 +20,7 @@
|
||||
#ifndef ENTITY_HANDLE_INCLUDED
|
||||
#define ENTITY_HANDLE_INCLUDED
|
||||
|
||||
#include "types.h"
|
||||
#include "lib/types.h"
|
||||
#include "Network/Serialization.h"
|
||||
|
||||
#define INVALID_HANDLE 65535
|
||||
|
Loading…
Reference in New Issue
Block a user