[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 25b30a5c7458841feb10e1343d7144c8e1280b99..d6b950811c0ca1007b4f5ccaa3009c503a67ce2c 100644 (file)
--- 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 da2ed4a45b73238de2bc1ed981fe687da0fce165..10204b744690bd65079b7c67b4a4aa8a47ebe825 100644 (file)
--- 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 c5f0b7fe7665ec5d97ee3606c63e8b4e9f622759..ff5192736c8d4e564244800785f1833a340aa436 100644 (file)
--- 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 8c9cbbc9c3faa4694a05993f39064352dcfb6b0d..60a3390886b798391b81919838afd393a053a3a8 100644 (file)
--- 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 526372ef54df803bb4101b710375417510500e68..27115d2d2bb8a5d246ee89d86c98da8ba477b52d 100644 (file)
--- 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 44a63fd650b2fcc25dfb63bff57646ecc49eb1ef..6ee28b256e716b57780fd10357ccb7d313bac77a 100644 (file)
--- 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 87ea6bd02b77b06c931b486ee60f466fae8f6c19..132451dd01ddbef4b1fdf7fe7dfa85ae99faceb7 100644 (file)
--- 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 342dab80b13f7acb7ffc52393ac0f165a187804c..0d021ce9d28efc2955dfac13da337a9aab266a9b 100644 (file)
--- 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 */
 {