From 3faafc96445d3a177364d8faedeb3eec0c97f683 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 25 Jul 2014 07:56:55 +1000
Subject: [PATCH] AP_Terrain: replace HAVE_AP_TERRAIN with AP_TERRAIN_AVAILABLE

---
 libraries/AP_Terrain/AP_Terrain.cpp  | 4 ++--
 libraries/AP_Terrain/AP_Terrain.h    | 8 ++++----
 libraries/AP_Terrain/TerrainGCS.cpp  | 4 ++--
 libraries/AP_Terrain/TerrainIO.cpp   | 4 ++--
 libraries/AP_Terrain/TerrainUtil.cpp | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/libraries/AP_Terrain/AP_Terrain.cpp b/libraries/AP_Terrain/AP_Terrain.cpp
index 3031047caa..7619197121 100644
--- a/libraries/AP_Terrain/AP_Terrain.cpp
+++ b/libraries/AP_Terrain/AP_Terrain.cpp
@@ -21,7 +21,7 @@
 #include <GCS.h>
 #include "AP_Terrain.h"
 
-#if HAVE_AP_TERRAIN
+#if AP_TERRAIN_AVAILABLE
 
 #include <assert.h>
 #include <stdio.h>
@@ -280,4 +280,4 @@ enum AP_Terrain::TerrainStatus AP_Terrain::status(void)
     return TerrainStatusOK; 
 }
 
-#endif // HAVE_AP_TERRAIN
+#endif // AP_TERRAIN_AVAILABLE
diff --git a/libraries/AP_Terrain/AP_Terrain.h b/libraries/AP_Terrain/AP_Terrain.h
index a55566d4ae..6f5bdb7531 100644
--- a/libraries/AP_Terrain/AP_Terrain.h
+++ b/libraries/AP_Terrain/AP_Terrain.h
@@ -21,12 +21,12 @@
 #include <AP_HAL.h>
 
 #if HAL_OS_POSIX_IO && defined(HAL_BOARD_TERRAIN_DIRECTORY)
-#define HAVE_AP_TERRAIN 1
+#define AP_TERRAIN_AVAILABLE 1
 #else
-#define HAVE_AP_TERRAIN 0
+#define AP_TERRAIN_AVAILABLE 0
 #endif
 
-#if HAVE_AP_TERRAIN
+#if AP_TERRAIN_AVAILABLE
 
 #include <AP_Param.h>
 #include <AP_AHRS.h>
@@ -344,5 +344,5 @@ private:
     float home_height;
     Location home_loc;
 };
-#endif // HAVE_AP_TERRAIN
+#endif // AP_TERRAIN_AVAILABLE
 #endif // __AP_TERRAIN_H__
diff --git a/libraries/AP_Terrain/TerrainGCS.cpp b/libraries/AP_Terrain/TerrainGCS.cpp
index 1a2584bd70..8f996d4556 100644
--- a/libraries/AP_Terrain/TerrainGCS.cpp
+++ b/libraries/AP_Terrain/TerrainGCS.cpp
@@ -24,7 +24,7 @@
 #include <GCS.h>
 #include "AP_Terrain.h"
 
-#if HAVE_AP_TERRAIN
+#if AP_TERRAIN_AVAILABLE
 
 #include <assert.h>
 #include <stdio.h>
@@ -271,4 +271,4 @@ void AP_Terrain::handle_terrain_data(mavlink_message_t *msg)
 }
 
 
-#endif // HAVE_AP_TERRAIN
+#endif // AP_TERRAIN_AVAILABLE
diff --git a/libraries/AP_Terrain/TerrainIO.cpp b/libraries/AP_Terrain/TerrainIO.cpp
index 35769a8438..79637953a9 100644
--- a/libraries/AP_Terrain/TerrainIO.cpp
+++ b/libraries/AP_Terrain/TerrainIO.cpp
@@ -24,7 +24,7 @@
 #include <GCS.h>
 #include "AP_Terrain.h"
 
-#if HAVE_AP_TERRAIN
+#if AP_TERRAIN_AVAILABLE
 
 #include <assert.h>
 #include <stdio.h>
@@ -329,4 +329,4 @@ void AP_Terrain::io_timer(void)
     }
 }
 
-#endif // HAVE_AP_TERRAIN
+#endif // AP_TERRAIN_AVAILABLE
diff --git a/libraries/AP_Terrain/TerrainUtil.cpp b/libraries/AP_Terrain/TerrainUtil.cpp
index 5a430c9396..2c3c11fbbe 100644
--- a/libraries/AP_Terrain/TerrainUtil.cpp
+++ b/libraries/AP_Terrain/TerrainUtil.cpp
@@ -24,7 +24,7 @@
 #include <GCS.h>
 #include "AP_Terrain.h"
 
-#if HAVE_AP_TERRAIN
+#if AP_TERRAIN_AVAILABLE
 
 #include <assert.h>
 #include <stdio.h>
@@ -188,4 +188,4 @@ uint16_t AP_Terrain::get_block_crc(struct grid_block &block)
     return ret;
 }
 
-#endif // HAVE_AP_TERRAIN
+#endif // AP_TERRAIN_AVAILABLE