aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@linux.intel.com>2011-04-13 23:00:16 +0100
committerMatt Fleming <matt.fleming@linux.intel.com>2011-04-26 09:53:54 +0100
commit951176f62a9dd81d0f978555bf2d5ce0b61d49ca (patch)
treeb36746be60450983b8ee3e6681b89e6d5d9458af
parent4965354404524633425c69a1adbbb386cfa0e1ed (diff)
downloadsyslinux-951176f62a9dd81d0f978555bf2d5ce0b61d49ca.tar.gz
syslinux-951176f62a9dd81d0f978555bf2d5ce0b61d49ca.tar.xz
syslinux-951176f62a9dd81d0f978555bf2d5ce0b61d49ca.zip
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 <matt.fleming@linux.intel.com>
-rw-r--r--com32/cmenu/adv_menu.tpl2
-rw-r--r--com32/cmenu/complex.c2
-rw-r--r--com32/cmenu/display.c2
-rw-r--r--com32/cmenu/libmenu/cmenu.h (renamed from com32/cmenu/libmenu/menu.h)0
-rw-r--r--com32/cmenu/libmenu/help.h2
-rw-r--r--com32/cmenu/libmenu/menu.c2
-rw-r--r--com32/cmenu/simple.c2
7 files changed, 6 insertions, 6 deletions
diff --git a/com32/cmenu/adv_menu.tpl b/com32/cmenu/adv_menu.tpl
index e60383f8..89317095 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 b80005d1..d6658fb3 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 3acdf6aa..59612f9f 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 <stdlib.h>
#include <com32.h>
diff --git a/com32/cmenu/libmenu/menu.h b/com32/cmenu/libmenu/cmenu.h
index 141d2ef0..141d2ef0 100644
--- a/com32/cmenu/libmenu/menu.h
+++ b/com32/cmenu/libmenu/cmenu.h
diff --git a/com32/cmenu/libmenu/help.h b/com32/cmenu/libmenu/help.h
index de01b46e..383cc3c5 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 <string.h>
diff --git a/com32/cmenu/libmenu/menu.c b/com32/cmenu/libmenu/menu.c
index 19a7e598..9b1e7ad0 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 <stdlib.h>
#include <console.h>
diff --git a/com32/cmenu/simple.c b/com32/cmenu/simple.c
index 4f602a9a..ba9669fc 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 <string.h>