clean up

16 files changed, 27 insertions, 28 deletions

diff --git a/hieroglyph/hgallocator.h b/hieroglyph/hgallocator.h
index 2f92154..b3ac594 100644
--- a/hieroglyph/hgallocator.h
+++ b/hieroglyph/hgallocator.h
@@ -136,7 +136,7 @@ struct _hg_mem_vtable_t {
 };
 
 
-hg_mem_vtable_t *hg_allocator_get_vtable   (void) G_GNUC_CONST;
+hg_mem_vtable_t *hg_allocator_get_vtable   (void) HG_GNUC_CONST;
 
 HG_END_DECLS
 
diff --git a/hieroglyph/hgarray.h b/hieroglyph/hgarray.h
index c93a450..dc00e42 100644
--- a/hieroglyph/hgarray.h
+++ b/hieroglyph/hgarray.h
@@ -54,7 +54,7 @@ struct _hg_array_t {
 };
 
 
-hg_object_vtable_t *hg_object_array_get_vtable(void) G_GNUC_CONST;
+hg_object_vtable_t *hg_object_array_get_vtable(void) HG_GNUC_CONST;
 hg_quark_t          hg_array_new              (hg_mem_t                 *mem,
                                                hg_usize_t                size,
                                                hg_pointer_t             *ret);
diff --git a/hieroglyph/hgdict.h b/hieroglyph/hgdict.h
index 1c9057e..f566d77 100644
--- a/hieroglyph/hgdict.h
+++ b/hieroglyph/hgdict.h
@@ -58,8 +58,8 @@ struct _hg_dict_t {
 };
 
 
-hg_object_vtable_t *hg_object_dict_get_vtable     (void) G_GNUC_CONST;
-hg_object_vtable_t *hg_object_dict_node_get_vtable(void) G_GNUC_CONST;
+hg_object_vtable_t *hg_object_dict_get_vtable     (void) HG_GNUC_CONST;
+hg_object_vtable_t *hg_object_dict_node_get_vtable(void) HG_GNUC_CONST;
 hg_quark_t          hg_dict_new                   (hg_mem_t                *mem,
                                                    hg_usize_t               size,
                                                    hg_bool_t                raise_dictfull,
diff --git a/hieroglyph/hgfile.h b/hieroglyph/hgfile.h
index f2c3991..70f28a4 100644
--- a/hieroglyph/hgfile.h
+++ b/hieroglyph/hgfile.h
@@ -122,7 +122,7 @@ struct _hg_file_io_data_t {
 	hg_gc_iterate_func_t gc_func;
 	hg_destroy_func_t    destroy_func;
 	hg_bool_t            is_eof;
-	gint                 fd;
+	hg_int_t             fd;
 	hg_pointer_t         mmapped_buffer;
 };
 struct _hg_file_gc_t {
@@ -133,8 +133,8 @@ struct _hg_file_gc_t {
 };
 
 
-hg_object_vtable_t     *hg_object_file_get_vtable  (void) G_GNUC_CONST;
-const hg_file_vtable_t *hg_file_get_lineedit_vtable(void) G_GNUC_CONST;
+hg_object_vtable_t     *hg_object_file_get_vtable  (void) HG_GNUC_CONST;
+const hg_file_vtable_t *hg_file_get_lineedit_vtable(void) HG_GNUC_CONST;
 hg_file_io_t            hg_file_get_io_type        (const hg_char_t                   *name);
 hg_quark_t              hg_file_new                (hg_mem_t                          *mem,
                                                     const hg_char_t                   *name,
diff --git a/hieroglyph/hggstate.h b/hieroglyph/hggstate.h
index 9873f21..20a5ee4 100644
--- a/hieroglyph/hggstate.h
+++ b/hieroglyph/hggstate.h
@@ -93,7 +93,7 @@ struct _hg_gstate_t {
 	hg_bool_t     is_snapshot:1;
 };
 
-hg_object_vtable_t *hg_object_gstate_get_vtable(void) G_GNUC_CONST;
+hg_object_vtable_t *hg_object_gstate_get_vtable(void) HG_GNUC_CONST;
 hg_quark_t          hg_gstate_new              (hg_mem_t      *mem,
                                                 hg_pointer_t  *ret);
 void                hg_gstate_set_ctm          (hg_gstate_t   *gstate,
diff --git a/hieroglyph/hglineedit.h b/hieroglyph/hglineedit.h
index 613335e..b2a8b49 100644
--- a/hieroglyph/hglineedit.h
+++ b/hieroglyph/hglineedit.h
@@ -53,7 +53,7 @@ struct _hg_lineedit_vtable_t {
 };
 
 
-hg_lineedit_vtable_t *hg_lineedit_get_default_vtable(void) G_GNUC_CONST;
+hg_lineedit_vtable_t *hg_lineedit_get_default_vtable(void) HG_GNUC_CONST;
 hg_lineedit_t        *hg_lineedit_new               (hg_mem_t                    *mem,
                                                      const hg_lineedit_vtable_t  *vtable,
                                                      hg_file_t                   *infile,
diff --git a/hieroglyph/hgoperator.h b/hieroglyph/hgoperator.h
index 7e51f9f..dc9e019 100644
--- a/hieroglyph/hgoperator.h
+++ b/hieroglyph/hgoperator.h
@@ -58,12 +58,12 @@ typedef hg_bool_t (* hg_operator_func_t) (hg_vm_t  *vm);
 	} HG_STMT_END
 
 #define INIT_STACK_VALIDATOR						\
-	hg_usize_t __hg_stack_odepth G_GNUC_UNUSED = hg_stack_depth(ostack); \
-	hg_usize_t __hg_stack_edepth G_GNUC_UNUSED = hg_stack_depth(estack); \
-	hg_usize_t __hg_stack_ddepth G_GNUC_UNUSED = hg_stack_depth(dstack); \
-	hg_size_t __hg_stack_expected_odepth G_GNUC_UNUSED = 0;		\
-	hg_size_t __hg_stack_expected_edepth G_GNUC_UNUSED = 0;		\
-	hg_size_t __hg_stack_expected_ddepth G_GNUC_UNUSED = 0
+	hg_usize_t __hg_stack_odepth HG_GNUC_UNUSED = hg_stack_depth(ostack); \
+	hg_usize_t __hg_stack_edepth HG_GNUC_UNUSED = hg_stack_depth(estack); \
+	hg_usize_t __hg_stack_ddepth HG_GNUC_UNUSED = hg_stack_depth(dstack); \
+	hg_size_t __hg_stack_expected_odepth HG_GNUC_UNUSED = 0;		\
+	hg_size_t __hg_stack_expected_edepth HG_GNUC_UNUSED = 0;		\
+	hg_size_t __hg_stack_expected_ddepth HG_GNUC_UNUSED = 0
 #define SET_EXPECTED_OSTACK_SIZE(_o_)		\
 	__hg_stack_expected_odepth = (_o_)
 #define SET_EXPECTED_ESTACK_SIZE(_e_)		\
@@ -156,10 +156,10 @@ typedef hg_bool_t (* hg_operator_func_t) (hg_vm_t  *vm);
 	static hg_bool_t						\
 	OPER_FUNC_NAME (_n_) (hg_vm_t *vm)				\
 	{								\
-		hg_stack_t *ostack G_GNUC_UNUSED = vm->stacks[HG_VM_STACK_OSTACK]; \
-		hg_stack_t *estack G_GNUC_UNUSED = vm->stacks[HG_VM_STACK_ESTACK]; \
-		hg_stack_t *dstack G_GNUC_UNUSED = vm->stacks[HG_VM_STACK_DSTACK]; \
-		hg_quark_t qself G_GNUC_UNUSED = hg_stack_index(estack, 0); \
+		hg_stack_t *ostack HG_GNUC_UNUSED = vm->stacks[HG_VM_STACK_OSTACK]; \
+		hg_stack_t *estack HG_GNUC_UNUSED = vm->stacks[HG_VM_STACK_ESTACK]; \
+		hg_stack_t *dstack HG_GNUC_UNUSED = vm->stacks[HG_VM_STACK_DSTACK]; \
+		hg_quark_t qself HG_GNUC_UNUSED = hg_stack_index(estack, 0); \
 		hg_bool_t retval = FALSE;				\
 		INIT_STACK_VALIDATOR;					\
 		HG_STMT_START
diff --git a/hieroglyph/hgpath.h b/hieroglyph/hgpath.h
index bb5ae54..d38f43d 100644
--- a/hieroglyph/hgpath.h
+++ b/hieroglyph/hgpath.h
@@ -112,7 +112,7 @@ struct _hg_path_operate_vtable_t {
 };
 
 
-hg_object_vtable_t *hg_object_path_get_vtable(void) G_GNUC_CONST;
+hg_object_vtable_t *hg_object_path_get_vtable(void) HG_GNUC_CONST;
 hg_quark_t          hg_path_new              (hg_mem_t                 *mem,
                                               hg_pointer_t             *ret);
 hg_bool_t           hg_path_get_current_point(hg_path_t                *path,
diff --git a/hieroglyph/hgsnapshot.h b/hieroglyph/hgsnapshot.h
index 8644524..11b6a52 100644
--- a/hieroglyph/hgsnapshot.h
+++ b/hieroglyph/hgsnapshot.h
@@ -41,7 +41,7 @@ HG_BEGIN_DECLS
 
 typedef struct _hg_snapshot_t		hg_snapshot_t;
 
-hg_object_vtable_t *hg_object_snapshot_get_vtable(void) G_GNUC_CONST;
+hg_object_vtable_t *hg_object_snapshot_get_vtable(void) HG_GNUC_CONST;
 hg_quark_t          hg_snapshot_new              (hg_mem_t      *mem,
 						  hg_pointer_t  *ret);
 hg_bool_t           hg_snapshot_save             (hg_snapshot_t *snapshot);
diff --git a/hieroglyph/hgstack.h b/hieroglyph/hgstack.h
index e6fc252..279baad 100644
--- a/hieroglyph/hgstack.h
+++ b/hieroglyph/hgstack.h
@@ -41,7 +41,7 @@ typedef struct _hg_stack_spool_t	hg_stack_spool_t;
 typedef struct _hg_stack_t		hg_stack_t;
 
 
-hg_object_vtable_t *hg_object_stack_get_vtable(void) G_GNUC_CONST;
+hg_object_vtable_t *hg_object_stack_get_vtable(void) HG_GNUC_CONST;
 hg_stack_spool_t   *hg_stack_spooler_new      (hg_mem_t                 *mem);
 void                hg_stack_spooler_destroy  (hg_stack_spool_t         *spool);
 hg_stack_t         *hg_stack_new              (hg_mem_t                 *mem,
diff --git a/hieroglyph/hgstring.h b/hieroglyph/hgstring.h
index b1e6a83..fe7c9d4 100644
--- a/hieroglyph/hgstring.h
+++ b/hieroglyph/hgstring.h
@@ -56,7 +56,7 @@ struct _hg_string_t {
 	hg_bool_t   is_fixed_size:1;
 };
 
-hg_object_vtable_t *hg_object_string_get_vtable (void) G_GNUC_CONST;
+hg_object_vtable_t *hg_object_string_get_vtable (void) HG_GNUC_CONST;
 hg_quark_t          hg_string_new               (hg_mem_t          *mem,
                                                  hg_usize_t         requisition_size,
                                                  hg_pointer_t      *ret);
diff --git a/hieroglyph/hgtypes.h b/hieroglyph/hgtypes.h
index 817f2d2..1eb6ed3 100644
--- a/hieroglyph/hgtypes.h
+++ b/hieroglyph/hgtypes.h
@@ -30,7 +30,6 @@
 
 #include <stdint.h>
 #include <sys/types.h>
-#include <glib.h>
 #include <hgconfig.h>
 #include <hieroglyph/hgmacros.h>
 
diff --git a/hieroglyph/hgversion.h.in b/hieroglyph/hgversion.h.in
index 1e32a72..faf76e2 100644
--- a/hieroglyph/hgversion.h.in
+++ b/hieroglyph/hgversion.h.in
@@ -38,7 +38,7 @@ HG_BEGIN_DECLS
 #define HIEROGLYPH_MINOR_VERSION	@HIEROGLYPH_MINOR_VERSION@
 #define HIEROGLYPH_RELEASE_VERSION	@HIEROGLYPH_RELEASE_VERSION@
 
-const hg_char_t *__hg_rcsid G_GNUC_UNUSED = "$Rev$";
+const hg_char_t *__hg_rcsid HG_GNUC_UNUSED = "$Rev$";
 
 HG_END_DECLS
 
diff --git a/hieroglyph/hgvm.c b/hieroglyph/hgvm.c
index 236da84..5afac10 100644
--- a/hieroglyph/hgvm.c
+++ b/hieroglyph/hgvm.c
@@ -2094,7 +2094,7 @@ hg_vm_main_loop(hg_vm_t *vm)
  * Returns:
  */
 hg_char_t *
-hg_vm_find_libfile(hg_vm_t         *vm G_GNUC_UNUSED,
+hg_vm_find_libfile(hg_vm_t         *vm HG_GNUC_UNUSED,
 		   const hg_char_t *filename)
 {
 	hg_return_val_if_fail (filename != NULL, NULL, HG_e_VMerror);
diff --git a/hieroglyph/hgvm.h b/hieroglyph/hgvm.h
index 1665b02..1d75092 100644
--- a/hieroglyph/hgvm.h
+++ b/hieroglyph/hgvm.h
@@ -192,7 +192,7 @@ gboolean           hg_vm_stepi                 (hg_vm_t            *vm,
                                                 gboolean           *is_proceeded);
 gboolean           hg_vm_step                  (hg_vm_t            *vm);
 gboolean           hg_vm_main_loop             (hg_vm_t            *vm);
-gchar             *hg_vm_find_libfile          (hg_vm_t            *vm G_GNUC_UNUSED,
+gchar             *hg_vm_find_libfile          (hg_vm_t            *vm HG_GNUC_UNUSED,
                                                 const gchar        *filename);
 gboolean           hg_vm_eval                  (hg_vm_t            *vm,
                                                 hg_quark_t          qeval,
diff --git a/src/hgs/hgs.c b/src/hgs/hgs.c
index 61f5055..8e10008 100644
--- a/src/hgs/hgs.c
+++ b/src/hgs/hgs.c
@@ -45,7 +45,7 @@ _hgs_arg_define_cb(const gchar  *option_name,
 		   GError      **error)
 {
 	gboolean retval = FALSE;
-	hg_vm_t *vm G_GNUC_UNUSED = data;
+	hg_vm_t *vm HG_GNUC_UNUSED = data;
 	hg_vm_value_t *v;
 
 	if (value && *value) {