[HB] simplify macros

diff --git a/src/hb-buffer-private.h b/src/hb-buffer-private.h
index 5268c04..40021fd 100644 (file)
--- a/src/hb-buffer-private.h
+++ b/src/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/src/hb-buffer.h b/src/hb-buffer.h
index 93ac3ee..1e660f4 100644 (file)
--- a/src/hb-buffer.h
+++ b/src/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/src/hb-common.h b/src/hb-common.h
index 1cdbd5e..2b42216 100644 (file)
--- a/src/hb-common.h
+++ b/src/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/src/hb-ot-layout-private.h b/src/hb-ot-layout-private.h
index a469119..27a18b8 100644 (file)
--- a/src/hb-ot-layout-private.h
+++ b/src/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/src/hb-ot-layout.h b/src/hb-ot-layout.h
index c1dbdca..f39beb7 100644 (file)
--- a/src/hb-ot-layout.h
+++ b/src/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 */