From: Charlie Brej <cbrej@cs.man.ac.uk>
Date: Wed, 9 Sep 2009 16:07:50 +0000 (+0100)
Subject: [script] Correct some header files
X-Git-Tag: 0.7.2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=033c638610434e77287a56a9c0fc85fdc39140ea;p=thirdparty%2Fplymouth.git

[script] Correct some header files

Missing includes and incorrect recursion protection names
---

diff --git a/src/plugins/splash/script/script-lib-image.h b/src/plugins/splash/script/script-lib-image.h
index 25b30a5c..d6b95081 100644
--- a/src/plugins/splash/script/script-lib-image.h
+++ b/src/plugins/splash/script/script-lib-image.h
@@ -19,8 +19,8 @@
  *
  * Written by: Charlie Brej <cbrej@cs.man.ac.uk>
  */
-#ifndef SCRIPT_LIB_IMAGE
-#define SCRIPT_LIB_IMAGE
+#ifndef SCRIPT_LIB_IMAGE_H
+#define SCRIPT_LIB_IMAGE_H
 
 #include "script.h"
 
@@ -35,4 +35,4 @@ script_lib_image_data_t *script_lib_image_setup (script_state_t *state,
                                                  char           *image_dir);
 void script_lib_image_destroy (script_lib_image_data_t *data);
 
-#endif /* SCRIPT_LIB_IMAGE */
+#endif /* SCRIPT_LIB_IMAGE_H */
diff --git a/src/plugins/splash/script/script-lib-math.h b/src/plugins/splash/script/script-lib-math.h
index da2ed4a4..10204b74 100644
--- a/src/plugins/splash/script/script-lib-math.h
+++ b/src/plugins/splash/script/script-lib-math.h
@@ -19,8 +19,8 @@
  *
  * Written by: Charlie Brej <cbrej@cs.man.ac.uk>
  */
-#ifndef SCRIPT_LIB_MATH
-#define SCRIPT_LIB_MATH
+#ifndef SCRIPT_LIB_MATH_H
+#define SCRIPT_LIB_MATH_H
 
 #include "script.h"
 
@@ -32,4 +32,4 @@ typedef struct
 script_lib_math_data_t *script_lib_math_setup (script_state_t *state);
 void script_lib_math_destroy (script_lib_math_data_t *data);
 
-#endif /* SCRIPT_LIB_MATH */
+#endif /* SCRIPT_LIB_MATH_H */
diff --git a/src/plugins/splash/script/script-lib-plymouth.h b/src/plugins/splash/script/script-lib-plymouth.h
index c5f0b7fe..ff519273 100644
--- a/src/plugins/splash/script/script-lib-plymouth.h
+++ b/src/plugins/splash/script/script-lib-plymouth.h
@@ -19,8 +19,8 @@
  *
  * Written by: Charlie Brej <cbrej@cs.man.ac.uk>
  */
-#ifndef SCRIPT_LIB_PLYMOUTH
-#define SCRIPT_LIB_PLYMOUTH
+#ifndef SCRIPT_LIB_PLYMOUTH_H
+#define SCRIPT_LIB_PLYMOUTH_H
 
 #include "ply-boot-splash-plugin.h"
 #include "script.h"
@@ -72,4 +72,4 @@ void script_lib_plymouth_on_message (script_state_t             *state,
                                      script_lib_plymouth_data_t *data,
                                      const char                 *new_message);
 
-#endif /* SCRIPT_LIB_PLYMOUTH */
+#endif /* SCRIPT_LIB_PLYMOUTH_H */
diff --git a/src/plugins/splash/script/script-lib-sprite.h b/src/plugins/splash/script/script-lib-sprite.h
index 8c9cbbc9..60a33908 100644
--- a/src/plugins/splash/script/script-lib-sprite.h
+++ b/src/plugins/splash/script/script-lib-sprite.h
@@ -19,8 +19,8 @@
  *
  * Written by: Charlie Brej <cbrej@cs.man.ac.uk>
  */
-#ifndef SCRIPT_LIB_SPRITE
-#define SCRIPT_LIB_SPRITE
+#ifndef SCRIPT_LIB_SPRITE_H
+#define SCRIPT_LIB_SPRITE_H
 
 #include "script.h"
 
@@ -58,4 +58,4 @@ script_lib_sprite_data_t *script_lib_sprite_setup (script_state_t *state,
 void script_lib_sprite_refresh (script_lib_sprite_data_t *data);
 void script_lib_sprite_destroy (script_lib_sprite_data_t *data);
 
-#endif /* SCRIPT_LIB_SPRITE */
+#endif /* SCRIPT_LIB_SPRITE_H */
diff --git a/src/plugins/splash/script/script-object.h b/src/plugins/splash/script/script-object.h
index 526372ef..27115d2d 100644
--- a/src/plugins/splash/script/script-object.h
+++ b/src/plugins/splash/script/script-object.h
@@ -19,10 +19,11 @@
  *
  * Written by: Charlie Brej <cbrej@cs.man.ac.uk>
  */
-#ifndef SCRIPT_OBJECT
-#define SCRIPT_OBJECT
+#ifndef SCRIPT_OBJECT_H
+#define SCRIPT_OBJECT_H
 
 #include "script.h"
+#include <stdbool.h>
 
 
 typedef enum
@@ -102,4 +103,4 @@ script_obj_t *script_obj_mod (script_obj_t *script_obj_a_in,
                               script_obj_t *script_obj_b_in);
 script_obj_cmp_result_t script_obj_cmp (script_obj_t *script_obj_a,
                                         script_obj_t *script_obj_b);
-#endif /* SCRIPT_OBJECT */
+#endif /* SCRIPT_OBJECT_H */
diff --git a/src/plugins/splash/script/script-parse.h b/src/plugins/splash/script/script-parse.h
index 44a63fd6..6ee28b25 100644
--- a/src/plugins/splash/script/script-parse.h
+++ b/src/plugins/splash/script/script-parse.h
@@ -19,8 +19,8 @@
  *
  * Written by: Charlie Brej <cbrej@cs.man.ac.uk>
  */
-#ifndef SCRIPT_PARSE
-#define SCRIPT_PARSE
+#ifndef SCRIPT_PARSE_H
+#define SCRIPT_PARSE_H
 
 #include "script.h"
 
@@ -29,4 +29,4 @@ script_op_t *script_parse_string (const char *string,
                                   const char *name);
 void script_parse_op_free (script_op_t *op);
 
-#endif /* SCRIPT_PARSE */
+#endif /* SCRIPT_PARSE_H */
diff --git a/src/plugins/splash/script/script-scan.h b/src/plugins/splash/script/script-scan.h
index 87ea6bd0..132451dd 100644
--- a/src/plugins/splash/script/script-scan.h
+++ b/src/plugins/splash/script/script-scan.h
@@ -19,8 +19,8 @@
  *
  * Written by: Charlie Brej <cbrej@cs.man.ac.uk>
  */
-#ifndef script_scan_H
-#define script_scan_H
+#ifndef SCRIPT_SCAN_H
+#define SCRIPT_SCAN_H
 
 #include "script-debug.h"
 #include "ply-bitarray.h"
@@ -106,4 +106,4 @@ void script_scan_read_next_token (script_scan_t       *scan,
                                   script_scan_token_t *token);
 
 
-#endif /* script_scan_H */
+#endif /* SCRIPT_SCAN_H */
diff --git a/src/plugins/splash/script/script.h b/src/plugins/splash/script/script.h
index 342dab80..0d021ce9 100644
--- a/src/plugins/splash/script/script.h
+++ b/src/plugins/splash/script/script.h
@@ -24,6 +24,7 @@
 
 #include "ply-hashtable.h"
 #include "ply-list.h"
+#include <stdbool.h>
 
 typedef enum                        /* FIXME add _t to all types */
 {