From 1c39635e7f5788b4777ee9f07d45b2228edeb899 Mon Sep 17 00:00:00 2001 From: ultramage Date: Thu, 30 Jun 2011 15:27:36 +0000 Subject: Removed extra guards around cbasetypes.h include lines, since they give no performance improvement. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14876 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/common/ers.h | 2 -- src/common/plugin.h | 2 -- src/common/plugins.h | 3 --- src/common/random.h | 2 -- src/common/socket.h | 2 -- src/common/sql.h | 2 -- src/common/strlib.h | 2 -- src/common/timer.h | 2 -- src/common/utils.h | 3 --- src/map/map.h | 2 -- 10 files changed, 22 deletions(-) diff --git a/src/common/ers.h b/src/common/ers.h index 47a076e6e..9e120c313 100644 --- a/src/common/ers.h +++ b/src/common/ers.h @@ -40,9 +40,7 @@ #ifndef _ERS_H_ #define _ERS_H_ -#ifndef _CBASETYPES_H_ #include "../common/cbasetypes.h" -#endif /*****************************************************************************\ * (1) All public parts of the Entry Reusage System. * diff --git a/src/common/plugin.h b/src/common/plugin.h index fd01be762..a367d2537 100644 --- a/src/common/plugin.h +++ b/src/common/plugin.h @@ -4,9 +4,7 @@ #ifndef _PLUGIN_H_ #define _PLUGIN_H_ -#ifndef _CBASETYPES_H_ #include "../common/cbasetypes.h" -#endif ////// Plugin functions /////////////// diff --git a/src/common/plugins.h b/src/common/plugins.h index e71a4e8c5..c1cf17afd 100644 --- a/src/common/plugins.h +++ b/src/common/plugins.h @@ -4,10 +4,7 @@ #ifndef _PLUGINS_H_ #define _PLUGINS_H_ -#ifndef _CBASETYPES_H_ #include "../common/cbasetypes.h" -#endif - #include "../common/plugin.h" ////// Dynamic Link Library functions /////////////// diff --git a/src/common/random.h b/src/common/random.h index 1bb8ecfb5..59b609464 100644 --- a/src/common/random.h +++ b/src/common/random.h @@ -4,9 +4,7 @@ #ifndef _RANDOM_H_ #define _RANDOM_H_ -#ifndef _CBASETYPES_H_ #include "../common/cbasetypes.h" -#endif void rnd_init(void); void rnd_seed(uint32); diff --git a/src/common/socket.h b/src/common/socket.h index 2f0ec6081..a5d519d0e 100644 --- a/src/common/socket.h +++ b/src/common/socket.h @@ -4,9 +4,7 @@ #ifndef _SOCKET_H_ #define _SOCKET_H_ -#ifndef _CBASETYPES_H_ #include "../common/cbasetypes.h" -#endif #ifdef WIN32 #define WIN32_LEAN_AND_MEAN // otherwise winsock2.h includes full windows.h diff --git a/src/common/sql.h b/src/common/sql.h index ef76b2ec5..5b318ab4d 100644 --- a/src/common/sql.h +++ b/src/common/sql.h @@ -4,9 +4,7 @@ #ifndef _COMMON_SQL_H_ #define _COMMON_SQL_H_ -#ifndef _CBASETYPES_H_ #include "../common/cbasetypes.h" -#endif #include // va_list diff --git a/src/common/strlib.h b/src/common/strlib.h index f5819bbcb..bbc2c6105 100644 --- a/src/common/strlib.h +++ b/src/common/strlib.h @@ -4,9 +4,7 @@ #ifndef _STRLIB_H_ #define _STRLIB_H_ -#ifndef _CBASETYPES_H_ #include "../common/cbasetypes.h" -#endif #include #define __USE_GNU // required to enable strnlen on some platforms diff --git a/src/common/timer.h b/src/common/timer.h index d27bf4c70..a615a5874 100644 --- a/src/common/timer.h +++ b/src/common/timer.h @@ -4,9 +4,7 @@ #ifndef _TIMER_H_ #define _TIMER_H_ -#ifndef _CBASETYPES_H_ #include "../common/cbasetypes.h" -#endif #define DIFF_TICK(a,b) ((int)((a)-(b))) diff --git a/src/common/utils.h b/src/common/utils.h index 2fe078615..8e39f2655 100644 --- a/src/common/utils.h +++ b/src/common/utils.h @@ -4,10 +4,7 @@ #ifndef _UTILS_H_ #define _UTILS_H_ -#ifndef _CBASETYPES_H_ #include "../common/cbasetypes.h" -#endif - #include // FILE* // generate a hex dump of the first 'length' bytes of 'buffer' diff --git a/src/map/map.h b/src/map/map.h index d5c4683d2..d5614354d 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -4,9 +4,7 @@ #ifndef _MAP_H_ #define _MAP_H_ -#ifndef _CBASETYPES_H_ #include "../common/cbasetypes.h" -#endif #include "../common/core.h" // CORE_ST_LAST #include "../common/mmo.h" #include "../common/mapindex.h" -- cgit v1.2.3-60-g2f50