(svn r21594) -Codechange: Whitespace fixes in ifndef/define lines.

19 files changed, 38 insertions, 38 deletions

diff --git a/src/misc/array.hpp b/src/misc/array.hpp
index e6850d665..3434ca21f 100644
--- a/src/misc/array.hpp
+++ b/src/misc/array.hpp
@@ -9,8 +9,8 @@
 
 /** @file array.hpp Array without an explicit maximum size. */
 
-#ifndef  ARRAY_HPP
-#define  ARRAY_HPP
+#ifndef ARRAY_HPP
+#define ARRAY_HPP
 
 #include "fixedsizearray.hpp"
 #include "str.hpp"
diff --git a/src/misc/binaryheap.hpp b/src/misc/binaryheap.hpp
index f7aedfc0a..c0aee7f2d 100644
--- a/src/misc/binaryheap.hpp
+++ b/src/misc/binaryheap.hpp
@@ -9,8 +9,8 @@
 
 /** @file binaryheap.hpp Binary heap implementation. */
 
-#ifndef  BINARYHEAP_HPP
-#define  BINARYHEAP_HPP
+#ifndef BINARYHEAP_HPP
+#define BINARYHEAP_HPP
 
 #include "../core/alloc_func.hpp"
 
diff --git a/src/misc/fixedsizearray.hpp b/src/misc/fixedsizearray.hpp
index c84938438..c9e4ea59a 100644
--- a/src/misc/fixedsizearray.hpp
+++ b/src/misc/fixedsizearray.hpp
@@ -9,8 +9,8 @@
 
 /** @file fixedsizearray.hpp A fixed size array that doesn't create items until needed. */
 
-#ifndef  FIXEDSIZEARRAY_HPP
-#define  FIXEDSIZEARRAY_HPP
+#ifndef FIXEDSIZEARRAY_HPP
+#define FIXEDSIZEARRAY_HPP
 
 #include "../core/alloc_func.hpp"
 
diff --git a/src/misc/hashtable.hpp b/src/misc/hashtable.hpp
index 9b1de9436..46ef7ca47 100644
--- a/src/misc/hashtable.hpp
+++ b/src/misc/hashtable.hpp
@@ -9,8 +9,8 @@
 
 /** @file hashtable.hpp Hash table support. */
 
-#ifndef  HASHTABLE_HPP
-#define  HASHTABLE_HPP
+#ifndef HASHTABLE_HPP
+#define HASHTABLE_HPP
 
 #include "../core/math_func.hpp"
 
diff --git a/src/misc/str.hpp b/src/misc/str.hpp
index ad1d85f62..78e5ed9fe 100644
--- a/src/misc/str.hpp
+++ b/src/misc/str.hpp
@@ -9,8 +9,8 @@
 
 /** @file str.hpp String formating? */
 
-#ifndef  STR_HPP
-#define  STR_HPP
+#ifndef STR_HPP
+#define STR_HPP
 
 #include <errno.h>
 #include <stdarg.h>
diff --git a/src/pathfinder/pf_performance_timer.hpp b/src/pathfinder/pf_performance_timer.hpp
index a7b3fda5e..0f5557532 100644
--- a/src/pathfinder/pf_performance_timer.hpp
+++ b/src/pathfinder/pf_performance_timer.hpp
@@ -9,8 +9,8 @@
 
 /** @file pf_performance_timer.hpp Performance timer for pathfinders. */
 
-#ifndef  PF_PERFORMANCE_TIMER_HPP
-#define  PF_PERFORMANCE_TIMER_HPP
+#ifndef PF_PERFORMANCE_TIMER_HPP
+#define PF_PERFORMANCE_TIMER_HPP
 
 extern uint64 ottd_rdtsc();
 
diff --git a/src/pathfinder/yapf/nodelist.hpp b/src/pathfinder/yapf/nodelist.hpp
index a6e5c2b50..6a197f98d 100644
--- a/src/pathfinder/yapf/nodelist.hpp
+++ b/src/pathfinder/yapf/nodelist.hpp
@@ -9,8 +9,8 @@
 
 /** @file nodelist.hpp List of nodes used for the A-star pathfinder. */
 
-#ifndef  NODELIST_HPP
-#define  NODELIST_HPP
+#ifndef NODELIST_HPP
+#define NODELIST_HPP
 
 #include "../../misc/array.hpp"
 #include "../../misc/hashtable.hpp"
diff --git a/src/pathfinder/yapf/yapf.h b/src/pathfinder/yapf/yapf.h
index c5cb5d7f6..37b3bf41e 100644
--- a/src/pathfinder/yapf/yapf.h
+++ b/src/pathfinder/yapf/yapf.h
@@ -9,8 +9,8 @@
 
 /** @file yapf.h Entry point for OpenTTD to YAPF. */
 
-#ifndef  YAPF_H
-#define  YAPF_H
+#ifndef YAPF_H
+#define YAPF_H
 
 #include "../../direction_type.h"
 #include "../../track_type.h"
diff --git a/src/pathfinder/yapf/yapf.hpp b/src/pathfinder/yapf/yapf.hpp
index 8e8fb9a47..d3aa53438 100644
--- a/src/pathfinder/yapf/yapf.hpp
+++ b/src/pathfinder/yapf/yapf.hpp
@@ -9,8 +9,8 @@
 
 /** @file yapf.hpp Base includes/functions for YAPF. */
 
-#ifndef  YAPF_HPP
-#define  YAPF_HPP
+#ifndef YAPF_HPP
+#define YAPF_HPP
 
 #include "../../landscape.h"
 #include "../pathfinder_func.h"
diff --git a/src/pathfinder/yapf/yapf_base.hpp b/src/pathfinder/yapf/yapf_base.hpp
index d3450b58c..8c0be560b 100644
--- a/src/pathfinder/yapf/yapf_base.hpp
+++ b/src/pathfinder/yapf/yapf_base.hpp
@@ -9,8 +9,8 @@
 
 /** @file yapf_base.hpp Base classes for YAPF. */
 
-#ifndef  YAPF_BASE_HPP
-#define  YAPF_BASE_HPP
+#ifndef YAPF_BASE_HPP
+#define YAPF_BASE_HPP
 
 #include "../../debug.h"
 #include "../../settings_type.h"
diff --git a/src/pathfinder/yapf/yapf_cache.h b/src/pathfinder/yapf/yapf_cache.h
index ba342f011..1660a21c0 100644
--- a/src/pathfinder/yapf/yapf_cache.h
+++ b/src/pathfinder/yapf/yapf_cache.h
@@ -9,8 +9,8 @@
 
 /** @file yapf_cache.h Entry point for OpenTTD to YAPF's cache. */
 
-#ifndef  YAPF_CACHE_H
-#define  YAPF_CACHE_H
+#ifndef YAPF_CACHE_H
+#define YAPF_CACHE_H
 
 #include "../../track_type.h"
 
diff --git a/src/pathfinder/yapf/yapf_common.hpp b/src/pathfinder/yapf/yapf_common.hpp
index 6add0b132..12bca905a 100644
--- a/src/pathfinder/yapf/yapf_common.hpp
+++ b/src/pathfinder/yapf/yapf_common.hpp
@@ -9,8 +9,8 @@
 
 /** @file yapf_common.hpp Commonly used classes for YAPF. */
 
-#ifndef  YAPF_COMMON_HPP
-#define  YAPF_COMMON_HPP
+#ifndef YAPF_COMMON_HPP
+#define YAPF_COMMON_HPP
 
 /** YAPF origin provider base class - used when origin is one tile / multiple trackdirs */
 template <class Types>
diff --git a/src/pathfinder/yapf/yapf_costbase.hpp b/src/pathfinder/yapf/yapf_costbase.hpp
index 39424dc10..29d6c85c2 100644
--- a/src/pathfinder/yapf/yapf_costbase.hpp
+++ b/src/pathfinder/yapf/yapf_costbase.hpp
@@ -9,8 +9,8 @@
 
 /** @file yapf_costbase.hpp Handling of cost determination. */
 
-#ifndef  YAPF_COSTBASE_HPP
-#define  YAPF_COSTBASE_HPP
+#ifndef YAPF_COSTBASE_HPP
+#define YAPF_COSTBASE_HPP
 
 struct CYapfCostBase {
 	FORCEINLINE static bool stSlopeCost(TileIndex tile, Trackdir td)
diff --git a/src/pathfinder/yapf/yapf_costcache.hpp b/src/pathfinder/yapf/yapf_costcache.hpp
index 7e5354d95..ee4cee25c 100644
--- a/src/pathfinder/yapf/yapf_costcache.hpp
+++ b/src/pathfinder/yapf/yapf_costcache.hpp
@@ -9,8 +9,8 @@
 
 /** @file yapf_costcache.hpp Caching of segment costs. */
 
-#ifndef  YAPF_COSTCACHE_HPP
-#define  YAPF_COSTCACHE_HPP
+#ifndef YAPF_COSTCACHE_HPP
+#define YAPF_COSTCACHE_HPP
 
 #include "../../date_func.h"
 
diff --git a/src/pathfinder/yapf/yapf_costrail.hpp b/src/pathfinder/yapf/yapf_costrail.hpp
index 4b965f2e0..5d00adddb 100644
--- a/src/pathfinder/yapf/yapf_costrail.hpp
+++ b/src/pathfinder/yapf/yapf_costrail.hpp
@@ -9,8 +9,8 @@
 
 /** @file yapf_costrail.hpp Cost determination for rails. */
 
-#ifndef  YAPF_COSTRAIL_HPP
-#define  YAPF_COSTRAIL_HPP
+#ifndef YAPF_COSTRAIL_HPP
+#define YAPF_COSTRAIL_HPP
 
 #include "../../pbs.h"
 
diff --git a/src/pathfinder/yapf/yapf_destrail.hpp b/src/pathfinder/yapf/yapf_destrail.hpp
index 605ee7a50..45e425435 100644
--- a/src/pathfinder/yapf/yapf_destrail.hpp
+++ b/src/pathfinder/yapf/yapf_destrail.hpp
@@ -9,8 +9,8 @@
 
 /** @file yapf_destrail.hpp Determining the destination for rail vehicles. */
 
-#ifndef  YAPF_DESTRAIL_HPP
-#define  YAPF_DESTRAIL_HPP
+#ifndef YAPF_DESTRAIL_HPP
+#define YAPF_DESTRAIL_HPP
 
 class CYapfDestinationRailBase
 {
diff --git a/src/pathfinder/yapf/yapf_node.hpp b/src/pathfinder/yapf/yapf_node.hpp
index 47312e27f..0ed3748e5 100644
--- a/src/pathfinder/yapf/yapf_node.hpp
+++ b/src/pathfinder/yapf/yapf_node.hpp
@@ -9,8 +9,8 @@
 
 /** @file yapf_node.hpp Node in the pathfinder's graph. */
 
-#ifndef  YAPF_NODE_HPP
-#define  YAPF_NODE_HPP
+#ifndef YAPF_NODE_HPP
+#define YAPF_NODE_HPP
 
 /** Yapf Node Key that evaluates hash from (and compares) tile & exit dir. */
 struct CYapfNodeKeyExitDir {
diff --git a/src/pathfinder/yapf/yapf_node_rail.hpp b/src/pathfinder/yapf/yapf_node_rail.hpp
index fa92706c6..31149ec7c 100644
--- a/src/pathfinder/yapf/yapf_node_rail.hpp
+++ b/src/pathfinder/yapf/yapf_node_rail.hpp
@@ -9,8 +9,8 @@
 
 /** @file yapf_node_rail.hpp Node tailored for rail pathfinding. */
 
-#ifndef  YAPF_NODE_RAIL_HPP
-#define  YAPF_NODE_RAIL_HPP
+#ifndef YAPF_NODE_RAIL_HPP
+#define YAPF_NODE_RAIL_HPP
 
 /** key for cached segment cost for rail YAPF */
 struct CYapfRailSegmentKey
diff --git a/src/pathfinder/yapf/yapf_node_road.hpp b/src/pathfinder/yapf/yapf_node_road.hpp
index c84755b5f..d93ece9ec 100644
--- a/src/pathfinder/yapf/yapf_node_road.hpp
+++ b/src/pathfinder/yapf/yapf_node_road.hpp
@@ -9,8 +9,8 @@
 
 /** @file yapf_node_road.hpp Node tailored for road pathfinding. */
 
-#ifndef  YAPF_NODE_ROAD_HPP
-#define  YAPF_NODE_ROAD_HPP
+#ifndef YAPF_NODE_ROAD_HPP
+#define YAPF_NODE_ROAD_HPP
 
 /** Yapf Node for road YAPF */
 template <class Tkey_>