From 8e5fc679031068ad229756f1543feec90c14d6e0 Mon Sep 17 00:00:00 2001 From: Gustavo Jose de Sousa <gustavo.sousa@intel.com> Date: Tue, 11 Aug 2015 16:28:44 +1000 Subject: [PATCH] AP_Menu: standardize inclusion of libaries headers This commit changes the way libraries headers are included in source files: - If the header is in the same directory the source belongs to, so the notation '#include ""' is used with the path relative to the directory containing the source. - If the header is outside the directory containing the source, then we use the notation '#include <>' with the path relative to libraries folder. Some of the advantages of such approach: - Only one search path for libraries headers. - OSs like Windows may have a better lookup time. --- libraries/AP_Menu/AP_Menu.cpp | 6 +++--- libraries/AP_Menu/AP_Menu.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/AP_Menu/AP_Menu.cpp b/libraries/AP_Menu/AP_Menu.cpp index afe469bd63..5c2ee93db7 100644 --- a/libraries/AP_Menu/AP_Menu.cpp +++ b/libraries/AP_Menu/AP_Menu.cpp @@ -4,9 +4,9 @@ // Simple commandline menu system. // -#include <AP_Common.h> -#include <AP_Progmem.h> -#include <AP_HAL.h> +#include <AP_Common/AP_Common.h> +#include <AP_Progmem/AP_Progmem.h> +#include <AP_HAL/AP_HAL.h> #include <stdlib.h> #include <ctype.h> diff --git a/libraries/AP_Menu/AP_Menu.h b/libraries/AP_Menu/AP_Menu.h index a1962f3cad..7077df732a 100644 --- a/libraries/AP_Menu/AP_Menu.h +++ b/libraries/AP_Menu/AP_Menu.h @@ -17,7 +17,7 @@ #define __AP_MENU_H__ #include <inttypes.h> -#include <AP_HAL.h> +#include <AP_HAL/AP_HAL.h> #define MENU_COMMANDLINE_MAX 32 ///< maximum input line length #define MENU_ARGS_MAX 3 ///< maximum number of arguments