From 951176f62a9dd81d0f978555bf2d5ce0b61d49ca Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Wed, 13 Apr 2011 23:00:16 +0100 Subject: [PATCH] cmenu: Rename menu.h to cmenu.h In preparation for moving com32/menu/menu.h to com32/include/ let's rename com32/cmenu/menu.h. This stops us having two header files named menu.h which would mean that we'd have to be super careful with our include paths to ensure we included the correct header. Signed-off-by: Matt Fleming --- com32/cmenu/adv_menu.tpl | 2 +- com32/cmenu/complex.c | 2 +- com32/cmenu/display.c | 2 +- com32/cmenu/libmenu/{menu.h => cmenu.h} | 0 com32/cmenu/libmenu/help.h | 2 +- com32/cmenu/libmenu/menu.c | 2 +- com32/cmenu/simple.c | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename com32/cmenu/libmenu/{menu.h => cmenu.h} (100%) diff --git a/com32/cmenu/adv_menu.tpl b/com32/cmenu/adv_menu.tpl index e60383f..8931709 100644 --- a/com32/cmenu/adv_menu.tpl +++ b/com32/cmenu/adv_menu.tpl @@ -34,7 +34,7 @@ modify this template to suit your needs #define NULL ((void *) 0) #endif -#include "menu.h" +#include "cmenu.h" #include "help.h" #include "passwords.h" #include "com32io.h" diff --git a/com32/cmenu/complex.c b/com32/cmenu/complex.c index b80005d..d6658fb 100644 --- a/com32/cmenu/complex.c +++ b/com32/cmenu/complex.c @@ -14,7 +14,7 @@ #define NULL ((void *) 0) #endif -#include "menu.h" +#include "cmenu.h" #include "com32io.h" #include "help.h" #include "passwords.h" diff --git a/com32/cmenu/display.c b/com32/cmenu/display.c index 3acdf6a..59612f9 100644 --- a/com32/cmenu/display.c +++ b/com32/cmenu/display.c @@ -16,7 +16,7 @@ #include "help.h" #include "com32io.h" -#include "menu.h" +#include "cmenu.h" #include "tui.h" #include #include diff --git a/com32/cmenu/libmenu/menu.h b/com32/cmenu/libmenu/cmenu.h similarity index 100% rename from com32/cmenu/libmenu/menu.h rename to com32/cmenu/libmenu/cmenu.h diff --git a/com32/cmenu/libmenu/help.h b/com32/cmenu/libmenu/help.h index de01b46..383cc3c 100644 --- a/com32/cmenu/libmenu/help.h +++ b/com32/cmenu/libmenu/help.h @@ -13,7 +13,7 @@ #ifndef __HELP_H_ #define __HELP_H_ -#include "menu.h" +#include "cmenu.h" #include "com32io.h" #include "tui.h" #include diff --git a/com32/cmenu/libmenu/menu.c b/com32/cmenu/libmenu/menu.c index 19a7e59..9b1e7ad 100644 --- a/com32/cmenu/libmenu/menu.c +++ b/com32/cmenu/libmenu/menu.c @@ -10,7 +10,7 @@ * * ----------------------------------------------------------------------- */ -#include "menu.h" +#include "cmenu.h" #include "com32io.h" #include #include diff --git a/com32/cmenu/simple.c b/com32/cmenu/simple.c index 4f602a9..ba9669f 100644 --- a/com32/cmenu/simple.c +++ b/com32/cmenu/simple.c @@ -14,7 +14,7 @@ #define NULL ((void *) 0) #endif -#include "menu.h" +#include "cmenu.h" #include "com32io.h" #include -- 2.7.4