Avoid false positives in fs.lst, partmap.lst, and video.lst due to

prototype declarations.
* genmk.rb (PModule::rule): Define GRUB_LST_GENERATOR when
generating fs, partmap, and video lists.
* include/grub/fs.h (grub_fs_register): Omit prototype if
GRUB_LST_GENERATOR is defined.
* include/grub/partition.h (grub_partition_map_register): Likewise.
* include/grub/video.h (grub_video_register): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 8f85c127ac0a263a8fdbf9a77c200f1151075dde..aababc8456004dc4b602c09563befd3d68dad99d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-06-12  Colin Watson  <cjwatson@ubuntu.com>
+
+       Avoid false positives in fs.lst, partmap.lst, and video.lst due to
+       prototype declarations.
+
+       * genmk.rb (PModule::rule): Define GRUB_LST_GENERATOR when
+       generating fs, partmap, and video lists.
+       * include/grub/fs.h (grub_fs_register): Omit prototype if
+       GRUB_LST_GENERATOR is defined.
+       * include/grub/partition.h (grub_partition_map_register): Likewise.
+       * include/grub/video.h (grub_video_register): Likewise.
+
 2010-06-12  Javier Martín <lordhabbit@gmail.com>
 
        * include/grub/types.h: Check for GRUB_CPU_SIZEOF_LONG when appropriate.

diff --git a/genmk.rb b/genmk.rb
index e62dbd4f6d502ce9dda756e583f7d5a685cc5688..01b969ecfd218ec0e6978ad7c5a50bba363b0e13 100644 (file)
--- a/genmk.rb
+++ b/genmk.rb
@@ -228,7 +228,7 @@ VIDEOFILES += #{video}
 
 #{fs}: #{src} $(#{src}_DEPENDENCIES) genfslist.sh
        set -e; \
-         $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
+         $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} -DGRUB_LST_GENERATOR $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
          | sh $(srcdir)/genfslist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
 
 #{parttool}: #{src} $(#{src}_DEPENDENCIES) genparttoollist.sh
@@ -238,7 +238,7 @@ VIDEOFILES += #{video}
 
 #{partmap}: #{src} $(#{src}_DEPENDENCIES) genpartmaplist.sh
        set -e; \
-         $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
+         $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} -DGRUB_LST_GENERATOR $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
          | sh $(srcdir)/genpartmaplist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
 
 #{handler}: #{src} $(#{src}_DEPENDENCIES) genhandlerlist.sh
@@ -253,7 +253,7 @@ VIDEOFILES += #{video}
 
 #{video}: #{src} $(#{src}_DEPENDENCIES) genvideolist.sh
        set -e; \
-         $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
+         $(TARGET_CC) -I#{dir} -I$(srcdir)/#{dir} $(TARGET_CPPFLAGS) #{extra_flags} -DGRUB_LST_GENERATOR $(TARGET_#{flag}) $(#{prefix}_#{flag}) -E $< \
          | sh $(srcdir)/genvideolist.sh #{symbolic_name} > $@ || (rm -f $@; exit 1)
 
 "

diff --git a/include/grub/fs.h b/include/grub/fs.h
index 3368eb553430d5d000f8353061842227d5670df5..994eb8080913b8106cb7dbdcb07c1c24245d3c60 100644 (file)
--- a/include/grub/fs.h
+++ b/include/grub/fs.h
@@ -91,11 +91,13 @@ typedef int (*grub_fs_autoload_hook_t) (void);
 extern grub_fs_autoload_hook_t EXPORT_VAR(grub_fs_autoload_hook);
 extern grub_fs_t EXPORT_VAR (grub_fs_list);
 
+#ifndef GRUB_LST_GENERATOR
 static inline void
 grub_fs_register (grub_fs_t fs)
 {
   grub_list_push (GRUB_AS_LIST_P (&grub_fs_list), GRUB_AS_LIST (fs));
 }
+#endif
 
 static inline void
 grub_fs_unregister (grub_fs_t fs)

diff --git a/include/grub/partition.h b/include/grub/partition.h
index 722c7b3e08264fdb79838ddefb2f0d32b1e70931..a23e94e0723aaa8819f6439782dc1ec826476519 100644 (file)
--- a/include/grub/partition.h
+++ b/include/grub/partition.h
@@ -77,12 +77,14 @@ char *EXPORT_FUNC(grub_partition_get_name) (const grub_partition_t partition);
 
 extern grub_partition_map_t EXPORT_VAR(grub_partition_map_list);
 
+#ifndef GRUB_LST_GENERATOR
 static inline void
 grub_partition_map_register (grub_partition_map_t partmap)
 {
   grub_list_push (GRUB_AS_LIST_P (&grub_partition_map_list),
                  GRUB_AS_LIST (partmap));
 }
+#endif
 
 static inline void
 grub_partition_map_unregister (grub_partition_map_t partmap)

diff --git a/include/grub/video.h b/include/grub/video.h
index 0a8fe1efe141f2422708954574f1468ff96dfb0c..faf2973eff335ae05409f5a396629a40886d9109 100644 (file)
--- a/include/grub/video.h
+++ b/include/grub/video.h
@@ -264,6 +264,7 @@ typedef struct grub_video_adapter *grub_video_adapter_t;
 
 extern grub_video_adapter_t EXPORT_VAR(grub_video_adapter_list);
 
+#ifndef GRUB_LST_GENERATOR
 /* Register video driver.  */
 static inline void
 grub_video_register (grub_video_adapter_t adapter)
@@ -271,6 +272,7 @@ grub_video_register (grub_video_adapter_t adapter)
   grub_list_push (GRUB_AS_LIST_P (&grub_video_adapter_list),
                  GRUB_AS_LIST (adapter));
 }
+#endif
 
 /* Unregister video driver.  */
 static inline void