From 8690ed7d482374c3d05eb52419d68ed7d29bee81 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Sun, 24 May 2009 15:01:16 -0400
Subject: [PATCH] [HB] simplify macros

---
 pango/opentype/hb-buffer-private.h    | 4 ++--
 pango/opentype/hb-buffer.h            | 4 ++--
 pango/opentype/hb-common.h            | 8 ++++----
 pango/opentype/hb-ot-layout-private.h | 4 ++--
 pango/opentype/hb-ot-layout.h         | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pango/opentype/hb-buffer-private.h b/pango/opentype/hb-buffer-private.h
index 5268c04..40021fd 100644
--- a/pango/opentype/hb-buffer-private.h
+++ b/pango/opentype/hb-buffer-private.h
@@ -31,7 +31,7 @@
 #include "hb-private.h"
 #include "hb-buffer.h"
 
-HB_BEGIN_DECLS();
+HB_BEGIN_DECLS
 
 #define HB_GLYPH_PROPERTY_UNKNOWN 0xFFFF
 
@@ -101,6 +101,6 @@ _hb_buffer_allocate_ligid (hb_buffer_t *buffer);
 #define COPY_Glyph (buffer)								\
 	   ((error = _hb_buffer_next_glyph  (buffer)) != HB_Err_Ok)
 
-HB_END_DECLS();
+HB_END_DECLS
 
 #endif /* HB_BUFFER_PRIVATE_H */
diff --git a/pango/opentype/hb-buffer.h b/pango/opentype/hb-buffer.h
index c7bf61f..02e1a16 100644
--- a/pango/opentype/hb-buffer.h
+++ b/pango/opentype/hb-buffer.h
@@ -30,7 +30,7 @@
 
 #include "hb-common.h"
 
-HB_BEGIN_DECLS();
+HB_BEGIN_DECLS
 
 typedef struct HB_GlyphItemRec_ {
   hb_codepoint_t gindex;
@@ -89,6 +89,6 @@ hb_buffer_add_glyph (hb_buffer_t    *buffer,
 		     unsigned int    properties,
 		     unsigned int    cluster);
 
-HB_END_DECLS();
+HB_END_DECLS
 
 #endif /* HB_BUFFER_H */
diff --git a/pango/opentype/hb-common.h b/pango/opentype/hb-common.h
index 1cdbd5e..2b42216 100644
--- a/pango/opentype/hb-common.h
+++ b/pango/opentype/hb-common.h
@@ -30,11 +30,11 @@
 #include <stdint.h>
 
 # ifdef __cplusplus
-#  define HB_BEGIN_DECLS() extern "C" { extern int _hb_dummy_prototype1 (int)
-#  define HB_END_DECLS() } extern "C" int _hb_dummy_prototype2 (int)
+#  define HB_BEGIN_DECLS	extern "C" {
+#  define HB_END_DECLS		}
 # else /* !__cplusplus */
-#  define HB_BEGIN_DECLS()   extern int _hb_dummy_prototype1 (int)
-#  define HB_END_DECLS()     extern int _hb_dummy_prototype2 (int)
+#  define HB_BEGIN_DECLS
+#  define HB_END_DECLS
 # endif /* !__cplusplus */
 
 typedef int hb_bool_t;
diff --git a/pango/opentype/hb-ot-layout-private.h b/pango/opentype/hb-ot-layout-private.h
index a469119..27a18b8 100644
--- a/pango/opentype/hb-ot-layout-private.h
+++ b/pango/opentype/hb-ot-layout-private.h
@@ -67,7 +67,7 @@ struct _hb_ot_layout_t
 /* XXX #define HB_OT_LAYOUT_INTERNAL static */
 #define HB_OT_LAYOUT_INTERNAL
 
-HB_BEGIN_DECLS();
+HB_BEGIN_DECLS
 
 /*
  * GDEF
@@ -96,6 +96,6 @@ void
 hb_buffer_ensure (hb_buffer_t  *buffer,
 		  unsigned int  size);
 
-HB_END_DECLS();
+HB_END_DECLS
 
 #endif /* HB_OT_LAYOUT_PRIVATE_H */
diff --git a/pango/opentype/hb-ot-layout.h b/pango/opentype/hb-ot-layout.h
index c1dbdca..f39beb7 100644
--- a/pango/opentype/hb-ot-layout.h
+++ b/pango/opentype/hb-ot-layout.h
@@ -30,7 +30,7 @@
 #include "hb-common.h"
 #include "hb-buffer.h"
 
-HB_BEGIN_DECLS();
+HB_BEGIN_DECLS
 
 /*
  * hb_ot_layout_t
@@ -245,6 +245,6 @@ hb_ot_layout_position_lookup   (hb_ot_layout_t              *layout,
 
 */
 
-HB_END_DECLS();
+HB_END_DECLS
 
 #endif /* HB_OT_LAYOUT_H */
-- 
2.7.4