[HarfBuzz] harfbuzz-ng: Branch 'master' - 3 commits
Behdad Esfahbod
behdad at kemper.freedesktop.org
Thu Aug 4 17:01:19 PDT 2011
configure.ac | 2 ++
src/check-c-linkage-decls.sh | 3 +--
src/hb-blob.cc | 2 --
src/hb-buffer-private.hh | 2 --
src/hb-buffer.cc | 2 --
src/hb-common.cc | 2 --
src/hb-font-private.hh | 2 --
src/hb-font.cc | 2 --
src/hb-ft.cc | 2 --
src/hb-glib.cc | 2 --
src/hb-icu.cc | 2 --
src/hb-mutex-private.hh | 2 --
src/hb-object-private.hh | 4 ----
src/hb-open-file-private.hh | 2 --
src/hb-open-type-private.hh | 4 ----
src/hb-ot-head-private.hh | 2 --
src/hb-ot-layout-common-private.hh | 4 ----
src/hb-ot-layout-gdef-private.hh | 2 --
src/hb-ot-layout-gpos-private.hh | 4 ----
src/hb-ot-layout-gsub-private.hh | 4 ----
src/hb-ot-layout-gsubgpos-private.hh | 6 ------
src/hb-ot-layout-private.hh | 2 --
src/hb-ot-layout.cc | 2 --
src/hb-ot-map-private.hh | 6 ++++--
src/hb-ot-map.cc | 2 --
src/hb-ot-maxp-private.hh | 2 --
src/hb-ot-shape-complex-arabic-table.hh | 2 --
src/hb-ot-shape-complex-arabic.cc | 2 --
src/hb-ot-shape-complex-indic-table.hh | 2 --
src/hb-ot-shape-complex-indic.cc | 2 --
src/hb-ot-shape-complex-misc.cc | 2 --
src/hb-ot-shape-complex-private.hh | 2 --
src/hb-ot-shape-normalize.cc | 2 --
src/hb-ot-shape-private.hh | 2 --
src/hb-ot-shape.cc | 2 --
src/hb-ot-tag.cc | 2 --
src/hb-private.hh | 8 --------
src/hb-shape.cc | 2 --
src/hb-unicode-private.hh | 2 --
src/hb-unicode.cc | 2 --
src/hb-uniscribe-shape.cc | 2 --
src/hb-view.cc | 2 --
src/main.cc | 2 --
src/test.cc | 2 --
44 files changed, 7 insertions(+), 106 deletions(-)
New commits:
commit c605bbbb6d4b2a98b1f40ca818760088d991f7d1
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Thu Aug 4 20:00:53 2011 -0400
Remove C++ guards from source files
Where causing issues for people with MSVC.
diff --git a/src/check-c-linkage-decls.sh b/src/check-c-linkage-decls.sh
index 35893a8..e7c95ab 100755
--- a/src/check-c-linkage-decls.sh
+++ b/src/check-c-linkage-decls.sh
@@ -7,10 +7,9 @@ test -z "$srcdir" && srcdir=.
stat=0
test "x$HBHEADERS" = x && HBHEADERS=`find . -maxdepth 1 -name 'hb*.h'`
-test "x$HBSOURCES" = x && HBSOURCES=`find . -maxdepth 1 -name 'hb-*.cc' -or -name 'hb-*.hh'`
-for x in $HBHEADERS $HBSOURCES; do
+for x in $HBHEADERS; do
test -f $srcdir/$x && x=$srcdir/$x
if ! grep -q HB_BEGIN_DECLS "$x" || ! grep -q HB_END_DECLS "$x"; then
echo "Ouch, file $x does not HB_BEGIN_DECLS / HB_END_DECLS"
diff --git a/src/hb-blob.cc b/src/hb-blob.cc
index 2d0c016..7ed3812 100644
--- a/src/hb-blob.cc
+++ b/src/hb-blob.cc
@@ -39,7 +39,6 @@
#include <stdio.h>
#include <errno.h>
-HB_BEGIN_DECLS
#ifndef HB_DEBUG_BLOB
@@ -322,4 +321,3 @@ _try_writable (hb_blob_t *blob)
}
-HB_END_DECLS
diff --git a/src/hb-buffer-private.hh b/src/hb-buffer-private.hh
index a4d7b8f..1a4a423 100644
--- a/src/hb-buffer-private.hh
+++ b/src/hb-buffer-private.hh
@@ -35,7 +35,6 @@
#include "hb-object-private.hh"
#include "hb-unicode-private.hh"
-HB_BEGIN_DECLS
ASSERT_STATIC (sizeof (hb_glyph_info_t) == 20);
@@ -149,6 +148,5 @@ struct _hb_buffer_t {
HB_BUFFER_XALLOCATE_VAR (b, deallocate_var, var (), #var)
-HB_END_DECLS
#endif /* HB_BUFFER_PRIVATE_HH */
diff --git a/src/hb-buffer.cc b/src/hb-buffer.cc
index 968e673..749330b 100644
--- a/src/hb-buffer.cc
+++ b/src/hb-buffer.cc
@@ -31,7 +31,6 @@
#include <string.h>
-HB_BEGIN_DECLS
#ifndef HB_DEBUG_BUFFER
@@ -788,4 +787,3 @@ hb_buffer_add_utf32 (hb_buffer_t *buffer,
}
-HB_END_DECLS
diff --git a/src/hb-common.cc b/src/hb-common.cc
index a886474..f2347d5 100644
--- a/src/hb-common.cc
+++ b/src/hb-common.cc
@@ -35,7 +35,6 @@
#include <locale.h>
-HB_BEGIN_DECLS
/* hb_tag_t */
@@ -357,4 +356,3 @@ hb_version_check (unsigned int major,
}
-HB_END_DECLS
diff --git a/src/hb-font-private.hh b/src/hb-font-private.hh
index dd71b67..76024fd 100644
--- a/src/hb-font-private.hh
+++ b/src/hb-font-private.hh
@@ -34,7 +34,6 @@
#include "hb-font.h"
#include "hb-object-private.hh"
-HB_BEGIN_DECLS
/*
@@ -159,6 +158,5 @@ struct _hb_font_t {
};
-HB_END_DECLS
#endif /* HB_FONT_PRIVATE_HH */
diff --git a/src/hb-font.cc b/src/hb-font.cc
index d92f598..3c5e802 100644
--- a/src/hb-font.cc
+++ b/src/hb-font.cc
@@ -34,7 +34,6 @@
#include <string.h>
-HB_BEGIN_DECLS
/*
@@ -920,4 +919,3 @@ hb_font_get_ppem (hb_font_t *font,
}
-HB_END_DECLS
diff --git a/src/hb-ft.cc b/src/hb-ft.cc
index 4a180ee..7e0c19b 100644
--- a/src/hb-ft.cc
+++ b/src/hb-ft.cc
@@ -33,7 +33,6 @@
#include FT_TRUETYPE_TABLES_H
-HB_BEGIN_DECLS
/* TODO:
@@ -344,4 +343,3 @@ hb_ft_font_create (FT_Face ft_face,
}
-HB_END_DECLS
diff --git a/src/hb-glib.cc b/src/hb-glib.cc
index 76e1dfd..1b322ea 100644
--- a/src/hb-glib.cc
+++ b/src/hb-glib.cc
@@ -34,7 +34,6 @@
#include <glib.h>
-HB_BEGIN_DECLS
#if !GLIB_CHECK_VERSION(2,29,14)
static const hb_script_t
@@ -347,4 +346,3 @@ hb_glib_get_unicode_funcs (void)
}
-HB_END_DECLS
diff --git a/src/hb-icu.cc b/src/hb-icu.cc
index 7fe78d2..82e4989 100644
--- a/src/hb-icu.cc
+++ b/src/hb-icu.cc
@@ -38,7 +38,6 @@
#include <unicode/unorm.h>
#include <unicode/unistr.h>
-HB_BEGIN_DECLS
hb_script_t
@@ -292,4 +291,3 @@ hb_icu_get_unicode_funcs (void)
}
-HB_END_DECLS
diff --git a/src/hb-mutex-private.hh b/src/hb-mutex-private.hh
index 0907e86..9855a56 100644
--- a/src/hb-mutex-private.hh
+++ b/src/hb-mutex-private.hh
@@ -34,7 +34,6 @@
#include "hb-private.hh"
-HB_BEGIN_DECLS
/* mutex */
@@ -107,6 +106,5 @@ struct hb_static_mutex_t : hb_mutex_t
};
-HB_END_DECLS
#endif /* HB_MUTEX_PRIVATE_HH */
diff --git a/src/hb-object-private.hh b/src/hb-object-private.hh
index 1b25443..c0a7bbe 100644
--- a/src/hb-object-private.hh
+++ b/src/hb-object-private.hh
@@ -36,7 +36,6 @@
#include "hb-mutex-private.hh"
-HB_BEGIN_DECLS
/* Debug */
@@ -200,7 +199,6 @@ struct _hb_object_header_t {
};
-HB_END_DECLS
/* object */
@@ -252,9 +250,7 @@ static inline void *hb_object_get_user_data (Type *obj,
}
-HB_BEGIN_DECLS
-HB_END_DECLS
#endif /* HB_OBJECT_PRIVATE_HH */
diff --git a/src/hb-open-file-private.hh b/src/hb-open-file-private.hh
index 7d43e46..62e1f17 100644
--- a/src/hb-open-file-private.hh
+++ b/src/hb-open-file-private.hh
@@ -29,7 +29,6 @@
#include "hb-open-type-private.hh"
-HB_BEGIN_DECLS
/*
@@ -253,6 +252,5 @@ struct OpenTypeFontFile
};
-HB_END_DECLS
#endif /* HB_OPEN_FILE_PRIVATE_HH */
diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index 0c2ccd8..a6f1389 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -31,8 +31,6 @@
#include "hb-blob.h"
-HB_BEGIN_DECLS
-HB_END_DECLS
/*
@@ -702,7 +700,5 @@ struct SortedArrayOf : ArrayOf<Type> {
};
-HB_BEGIN_DECLS
-HB_END_DECLS
#endif /* HB_OPEN_TYPE_PRIVATE_HH */
diff --git a/src/hb-ot-head-private.hh b/src/hb-ot-head-private.hh
index 436666f..5255b6a 100644
--- a/src/hb-ot-head-private.hh
+++ b/src/hb-ot-head-private.hh
@@ -29,7 +29,6 @@
#include "hb-open-type-private.hh"
-HB_BEGIN_DECLS
/*
@@ -140,6 +139,5 @@ struct head
};
-HB_END_DECLS
#endif /* HB_OT_HEAD_PRIVATE_HH */
diff --git a/src/hb-ot-layout-common-private.hh b/src/hb-ot-layout-common-private.hh
index ce47e22..5d19e08 100644
--- a/src/hb-ot-layout-common-private.hh
+++ b/src/hb-ot-layout-common-private.hh
@@ -38,8 +38,6 @@
#define NOT_COVERED ((unsigned int) 0x110000)
#define MAX_NESTING_LEVEL 8
-HB_BEGIN_DECLS
-HB_END_DECLS
/*
@@ -594,7 +592,5 @@ struct Device
};
-HB_BEGIN_DECLS
-HB_END_DECLS
#endif /* HB_OT_LAYOUT_COMMON_PRIVATE_HH */
diff --git a/src/hb-ot-layout-gdef-private.hh b/src/hb-ot-layout-gdef-private.hh
index 08fd757..10d40a6 100644
--- a/src/hb-ot-layout-gdef-private.hh
+++ b/src/hb-ot-layout-gdef-private.hh
@@ -33,7 +33,6 @@
#include "hb-font-private.hh"
-HB_BEGIN_DECLS
/*
@@ -424,6 +423,5 @@ struct GDEF
};
-HB_END_DECLS
#endif /* HB_OT_LAYOUT_GDEF_PRIVATE_HH */
diff --git a/src/hb-ot-layout-gpos-private.hh b/src/hb-ot-layout-gpos-private.hh
index e5edb3c..b0ffe93 100644
--- a/src/hb-ot-layout-gpos-private.hh
+++ b/src/hb-ot-layout-gpos-private.hh
@@ -31,7 +31,6 @@
#include "hb-ot-layout-gsubgpos-private.hh"
-HB_BEGIN_DECLS
/* buffer **position** var allocations */
@@ -1305,9 +1304,7 @@ struct MarkMarkPos
};
-HB_BEGIN_DECLS
static inline bool position_lookup (hb_apply_context_t *c, unsigned int lookup_index);
-HB_END_DECLS
struct ContextPos : Context
{
@@ -1632,6 +1629,5 @@ static inline bool position_lookup (hb_apply_context_t *c, unsigned int lookup_i
#undef cursive_chain
-HB_END_DECLS
#endif /* HB_OT_LAYOUT_GPOS_PRIVATE_HH */
diff --git a/src/hb-ot-layout-gsub-private.hh b/src/hb-ot-layout-gsub-private.hh
index aca45ff..91805ed 100644
--- a/src/hb-ot-layout-gsub-private.hh
+++ b/src/hb-ot-layout-gsub-private.hh
@@ -31,7 +31,6 @@
#include "hb-ot-layout-gsubgpos-private.hh"
-HB_BEGIN_DECLS
struct SingleSubstFormat1
@@ -524,9 +523,7 @@ struct LigatureSubst
};
-HB_BEGIN_DECLS
static inline bool substitute_lookup (hb_apply_context_t *c, unsigned int lookup_index);
-HB_END_DECLS
struct ContextSubst : Context
{
@@ -942,6 +939,5 @@ static inline bool substitute_lookup (hb_apply_context_t *c, unsigned int lookup
}
-HB_END_DECLS
#endif /* HB_OT_LAYOUT_GSUB_PRIVATE_HH */
diff --git a/src/hb-ot-layout-gsubgpos-private.hh b/src/hb-ot-layout-gsubgpos-private.hh
index 3dcfb21..abe020c 100644
--- a/src/hb-ot-layout-gsubgpos-private.hh
+++ b/src/hb-ot-layout-gsubgpos-private.hh
@@ -32,7 +32,6 @@
#include "hb-buffer-private.hh"
#include "hb-ot-layout-gdef-private.hh"
-HB_BEGIN_DECLS
/* buffer var allocations */
#define lig_id() var2.u8[2] /* unique ligature id */
@@ -54,7 +53,6 @@ static inline uint8_t allocate_lig_id (hb_buffer_t *buffer) {
hb_auto_trace_t<HB_DEBUG_APPLY> trace (&c->debug_depth, "APPLY", this, NULL, HB_FUNC);
-HB_BEGIN_DECLS
struct hb_apply_context_t
{
@@ -210,7 +208,6 @@ static inline bool match_lookahead (hb_apply_context_t *c,
return true;
}
-HB_END_DECLS
struct LookupRecord
@@ -229,7 +226,6 @@ struct LookupRecord
};
-HB_BEGIN_DECLS
static inline bool apply_lookup (hb_apply_context_t *c,
unsigned int count, /* Including the first glyph */
@@ -287,7 +283,6 @@ static inline bool apply_lookup (hb_apply_context_t *c,
return true;
}
-HB_END_DECLS
/* Contextual lookups */
@@ -984,6 +979,5 @@ struct GSUBGPOS
};
-HB_END_DECLS
#endif /* HB_OT_LAYOUT_GSUBGPOS_PRIVATE_HH */
diff --git a/src/hb-ot-layout-private.hh b/src/hb-ot-layout-private.hh
index ef24e8d..1f6e20b 100644
--- a/src/hb-ot-layout-private.hh
+++ b/src/hb-ot-layout-private.hh
@@ -34,7 +34,6 @@
#include "hb-font-private.hh"
#include "hb-buffer-private.hh"
-HB_BEGIN_DECLS
/*
@@ -104,6 +103,5 @@ HB_INTERNAL void
_hb_ot_layout_destroy (hb_ot_layout_t *layout);
-HB_END_DECLS
#endif /* HB_OT_LAYOUT_PRIVATE_HH */
diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index e7a1f98..ceae824 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -40,7 +40,6 @@
#include <stdlib.h>
#include <string.h>
-HB_BEGIN_DECLS
hb_ot_layout_t *
@@ -517,4 +516,3 @@ _hb_ot_layout_get_upem (hb_face_t *face)
}
-HB_END_DECLS
diff --git a/src/hb-ot-map-private.hh b/src/hb-ot-map-private.hh
index 77474b4..710cc0a 100644
--- a/src/hb-ot-map-private.hh
+++ b/src/hb-ot-map-private.hh
@@ -33,7 +33,6 @@
#include "hb-ot-layout.h"
-HB_BEGIN_DECLS
static const hb_tag_t table_tags[2] = {HB_OT_TAG_GSUB, HB_OT_TAG_GPOS};
@@ -188,6 +187,5 @@ struct hb_ot_map_builder_t
};
-HB_END_DECLS
#endif /* HB_OT_MAP_PRIVATE_HH */
diff --git a/src/hb-ot-map.cc b/src/hb-ot-map.cc
index ad1290f..a54e306 100644
--- a/src/hb-ot-map.cc
+++ b/src/hb-ot-map.cc
@@ -30,7 +30,6 @@
#include "hb-ot-shape-private.hh"
-HB_BEGIN_DECLS
void
@@ -273,4 +272,3 @@ hb_ot_map_builder_t::compile (hb_face_t *face,
}
-HB_END_DECLS
diff --git a/src/hb-ot-maxp-private.hh b/src/hb-ot-maxp-private.hh
index fa2cb26..92a07bd 100644
--- a/src/hb-ot-maxp-private.hh
+++ b/src/hb-ot-maxp-private.hh
@@ -29,7 +29,6 @@
#include "hb-open-type-private.hh"
-HB_BEGIN_DECLS
/*
@@ -63,6 +62,5 @@ struct maxp
};
-HB_END_DECLS
#endif /* HB_OT_MAXP_PRIVATE_HH */
diff --git a/src/hb-ot-shape-complex-arabic-table.hh b/src/hb-ot-shape-complex-arabic-table.hh
index 2b66dcc..5aa8716 100644
--- a/src/hb-ot-shape-complex-arabic-table.hh
+++ b/src/hb-ot-shape-complex-arabic-table.hh
@@ -29,7 +29,6 @@
#include "hb-private.hh"
-HB_BEGIN_DECLS
/* == Start of generated table == */
/*
@@ -755,6 +754,5 @@ static const uint8_t joining_table[] =
/* == End of generated table == */
-HB_END_DECLS
#endif /* HB_OT_SHAPE_COMPLEX_ARABIC_TABLE_HH */
diff --git a/src/hb-ot-shape-complex-arabic.cc b/src/hb-ot-shape-complex-arabic.cc
index 02df533..15b0aa4 100644
--- a/src/hb-ot-shape-complex-arabic.cc
+++ b/src/hb-ot-shape-complex-arabic.cc
@@ -26,7 +26,6 @@
#include "hb-ot-shape-complex-private.hh"
-HB_BEGIN_DECLS
/* buffer var allocations */
@@ -229,4 +228,3 @@ _hb_ot_shape_complex_setup_masks_arabic (hb_ot_map_t *map, hb_buffer_t *buffer)
}
-HB_END_DECLS
diff --git a/src/hb-ot-shape-complex-indic-table.hh b/src/hb-ot-shape-complex-indic-table.hh
index 2ee27b8..5077e8a 100644
--- a/src/hb-ot-shape-complex-indic-table.hh
+++ b/src/hb-ot-shape-complex-indic-table.hh
@@ -29,7 +29,6 @@
#include "hb-private.hh"
-HB_BEGIN_DECLS
/* == Start of generated table == */
/*
@@ -827,6 +826,5 @@ get_indic_categories (hb_codepoint_t u)
/* == End of generated table == */
-HB_END_DECLS
#endif /* HB_OT_SHAPE_COMPLEX_INDIC_TABLE_HH */
diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc
index fceb076..f3bae9a 100644
--- a/src/hb-ot-shape-complex-indic.cc
+++ b/src/hb-ot-shape-complex-indic.cc
@@ -26,7 +26,6 @@
#include "hb-ot-shape-complex-private.hh"
-HB_BEGIN_DECLS
/* buffer var allocations */
@@ -760,4 +759,3 @@ final_reordering (const hb_ot_map_t *map,
-HB_END_DECLS
diff --git a/src/hb-ot-shape-complex-misc.cc b/src/hb-ot-shape-complex-misc.cc
index b2de3ff..230704f 100644
--- a/src/hb-ot-shape-complex-misc.cc
+++ b/src/hb-ot-shape-complex-misc.cc
@@ -26,7 +26,6 @@
#include "hb-ot-shape-complex-private.hh"
-HB_BEGIN_DECLS
/* TODO Add kana, hangul, and other small sahpers here */
@@ -54,4 +53,3 @@ _hb_ot_shape_complex_setup_masks_default (hb_ot_map_t *map, hb_buffer_t *buffer)
}
-HB_END_DECLS
diff --git a/src/hb-ot-shape-complex-private.hh b/src/hb-ot-shape-complex-private.hh
index 1aca595..6582d59 100644
--- a/src/hb-ot-shape-complex-private.hh
+++ b/src/hb-ot-shape-complex-private.hh
@@ -31,7 +31,6 @@
#include "hb-ot-map-private.hh"
-HB_BEGIN_DECLS
/* buffer var allocations, used during the entire shaping process */
@@ -210,6 +209,5 @@ hb_ot_shape_complex_setup_masks (hb_ot_complex_shaper_t shaper,
}
-HB_END_DECLS
#endif /* HB_OT_SHAPE_COMPLEX_PRIVATE_HH */
diff --git a/src/hb-ot-shape-normalize.cc b/src/hb-ot-shape-normalize.cc
index e2fd91c..9b42d71 100644
--- a/src/hb-ot-shape-normalize.cc
+++ b/src/hb-ot-shape-normalize.cc
@@ -27,7 +27,6 @@
#include "hb-ot-shape-private.hh"
#include "hb-ot-shape-complex-private.hh"
-HB_BEGIN_DECLS
/*
* HIGHLEVEL DESIGN:
@@ -275,4 +274,3 @@ _hb_ot_shape_normalize (hb_ot_shape_context_t *c)
}
-HB_END_DECLS
diff --git a/src/hb-ot-shape-private.hh b/src/hb-ot-shape-private.hh
index 17f8273..11cfe53 100644
--- a/src/hb-ot-shape-private.hh
+++ b/src/hb-ot-shape-private.hh
@@ -34,7 +34,6 @@
#include "hb-ot-map-private.hh"
#include "hb-ot-shape-complex-private.hh"
-HB_BEGIN_DECLS
enum hb_ot_complex_shaper_t;
@@ -110,6 +109,5 @@ HB_INTERNAL void _hb_set_unicode_props (hb_buffer_t *buffer);
HB_INTERNAL void _hb_ot_shape_normalize (hb_ot_shape_context_t *c);
-HB_END_DECLS
#endif /* HB_OT_SHAPE_PRIVATE_HH */
diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc
index 9f41b29..5f8b372 100644
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc
@@ -31,7 +31,6 @@
#include "hb-font-private.hh"
-HB_BEGIN_DECLS
hb_tag_t common_features[] = {
@@ -442,4 +441,3 @@ hb_ot_shape (hb_font_t *font,
}
-HB_END_DECLS
diff --git a/src/hb-ot-tag.cc b/src/hb-ot-tag.cc
index 0ce635a..e910f95 100644
--- a/src/hb-ot-tag.cc
+++ b/src/hb-ot-tag.cc
@@ -31,7 +31,6 @@
#include <string.h>
-HB_BEGIN_DECLS
/* hb_script_t */
@@ -701,4 +700,3 @@ hb_ot_tag_to_language (hb_tag_t tag)
}
-HB_END_DECLS
diff --git a/src/hb-private.hh b/src/hb-private.hh
index b5c8cef..b2ef802 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -48,7 +48,6 @@
#include <errno.h>
#include <stdarg.h>
-HB_BEGIN_DECLS
/* Essentials */
@@ -66,7 +65,6 @@ HB_BEGIN_DECLS
/* Basics */
-HB_END_DECLS
#undef MIN
template <typename Type> static inline Type MIN (const Type &a, const Type &b) { return a < b ? a : b; }
@@ -74,7 +72,6 @@ template <typename Type> static inline Type MIN (const Type &a, const Type &b) {
#undef MAX
template <typename Type> static inline Type MAX (const Type &a, const Type &b) { return a > b ? a : b; }
-HB_BEGIN_DECLS
#undef ARRAY_LENGTH
#define ARRAY_LENGTH(__array) ((signed int) (sizeof (__array) / sizeof (__array[0])))
@@ -230,7 +227,6 @@ _hb_unsigned_int_mul_overflows (unsigned int count, unsigned int size)
typedef int (*hb_compare_func_t) (const void *, const void *);
-HB_END_DECLS
/* arrays and maps */
@@ -423,7 +419,6 @@ struct hb_lockable_set_t
};
-HB_BEGIN_DECLS
/* Big-endian handling */
@@ -470,7 +465,6 @@ static inline unsigned char TOLOWER (unsigned char c)
/* Debug */
-HB_END_DECLS
#ifndef HB_DEBUG
#define HB_DEBUG 0
@@ -625,8 +619,6 @@ hb_bubble_sort (T *array, unsigned int len, int(*compar)(const T *, const T *))
}
-HB_BEGIN_DECLS
-HB_END_DECLS
#endif /* HB_PRIVATE_HH */
diff --git a/src/hb-shape.cc b/src/hb-shape.cc
index 1ff830a..1b802d6 100644
--- a/src/hb-shape.cc
+++ b/src/hb-shape.cc
@@ -36,7 +36,6 @@
#include "hb-graphite.h"
#endif
-HB_BEGIN_DECLS
static void
@@ -90,4 +89,3 @@ hb_shape (hb_font_t *font,
}
-HB_END_DECLS
diff --git a/src/hb-unicode-private.hh b/src/hb-unicode-private.hh
index 2b0ec99..dace924 100644
--- a/src/hb-unicode-private.hh
+++ b/src/hb-unicode-private.hh
@@ -36,7 +36,6 @@
#include "hb-unicode.h"
#include "hb-object-private.hh"
-HB_BEGIN_DECLS
/*
@@ -104,6 +103,5 @@ extern HB_INTERNAL hb_unicode_funcs_t _hb_unicode_funcs_nil;
-HB_END_DECLS
#endif /* HB_UNICODE_PRIVATE_HH */
diff --git a/src/hb-unicode.cc b/src/hb-unicode.cc
index aba2cd3..2286f7b 100644
--- a/src/hb-unicode.cc
+++ b/src/hb-unicode.cc
@@ -32,7 +32,6 @@
#include "hb-unicode-private.hh"
-HB_BEGIN_DECLS
/*
@@ -271,4 +270,3 @@ hb_unicode_decompose (hb_unicode_funcs_t *ufuncs,
return ufuncs->func.decompose (ufuncs, ab, a, b, ufuncs->user_data.decompose);
}
-HB_END_DECLS
diff --git a/src/hb-uniscribe-shape.cc b/src/hb-uniscribe-shape.cc
index ed50e14..3d5b1d5 100644
--- a/src/hb-uniscribe-shape.cc
+++ b/src/hb-uniscribe-shape.cc
@@ -39,7 +39,6 @@
#include <windows.h>
#include <usp10.h>
-HB_BEGIN_DECLS
#ifndef HB_DEBUG_UNISCRIBE
@@ -322,4 +321,3 @@ retry:
}
-HB_END_DECLS
diff --git a/src/hb-view.cc b/src/hb-view.cc
index 31b2a24..dc3fc47 100644
--- a/src/hb-view.cc
+++ b/src/hb-view.cc
@@ -42,7 +42,6 @@
#include <cairo-ft.h>
#include <hb-ft.h>
-HB_BEGIN_DECLS
/* Controlled by cmd-line options */
@@ -567,4 +566,3 @@ main (int argc, char **argv)
}
-HB_END_DECLS
diff --git a/src/main.cc b/src/main.cc
index 31efa96..6fd5e1e 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -36,7 +36,6 @@
#include <stdlib.h>
#include <stdio.h>
-HB_BEGIN_DECLS
int
@@ -194,4 +193,3 @@ main (int argc, char **argv)
}
-HB_END_DECLS
diff --git a/src/test.cc b/src/test.cc
index e3747ce..b3e6929 100644
--- a/src/test.cc
+++ b/src/test.cc
@@ -37,7 +37,6 @@
#include <stdlib.h>
#include <stdio.h>
-HB_BEGIN_DECLS
int
@@ -97,4 +96,3 @@ main (int argc, char **argv)
}
-HB_END_DECLS
commit 8336186a52813b53e90b4399dc462d55750e2d37
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Thu Aug 4 19:49:05 2011 -0400
Zero map objects
diff --git a/src/hb-ot-map-private.hh b/src/hb-ot-map-private.hh
index 5e6aca3..77474b4 100644
--- a/src/hb-ot-map-private.hh
+++ b/src/hb-ot-map-private.hh
@@ -44,6 +44,8 @@ struct hb_ot_map_t
public:
+ hb_ot_map_t (void) { memset (this, 0, sizeof (*this)); }
+
typedef void (*gsub_pause_func_t) (const hb_ot_map_t *map, hb_face_t *face, hb_buffer_t *buffer, void *user_data);
typedef void (*gpos_pause_func_t) (const hb_ot_map_t *map, hb_font_t *font, hb_buffer_t *buffer, void *user_data);
@@ -137,6 +139,8 @@ struct hb_ot_map_builder_t
{
public:
+ hb_ot_map_builder_t (void) { memset (this, 0, sizeof (*this)); }
+
HB_INTERNAL void add_feature (hb_tag_t tag, unsigned int value, bool global);
inline void add_bool_feature (hb_tag_t tag, bool global = true)
commit ecd3b6e4ad253cf9d0dae1ed2da8ba6caed16b85
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Thu Aug 4 01:57:40 2011 -0400
More build fixes
diff --git a/configure.ac b/configure.ac
index 9e798cb..3a6e528 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,6 +112,8 @@ PKG_CHECK_MODULES(ICU, icu, have_icu=true, [
AC_SUBST(ICU_CFLAGS)
AC_SUBST(ICU_LIBS)
fi
+ else
+ have_icu=false
fi
])
if $have_icu; then
More information about the HarfBuzz
mailing list