De-C++ where possible

Helps with avoiding many "extern C" declarations in source files.
This commit is contained in:
Behdad Esfahbod 2010-07-23 15:00:13 -04:00
parent 0dd200d28f
commit cc6d52279d
8 changed files with 11 additions and 11 deletions

View File

@ -16,7 +16,7 @@ HBSOURCES = \
hb-buffer-private.hh \ hb-buffer-private.hh \
hb-common.c \ hb-common.c \
hb-font.cc \ hb-font.cc \
hb-font-private.hh \ hb-font-private.h \
hb-object-private.h \ hb-object-private.h \
hb-open-file-private.hh \ hb-open-file-private.hh \
hb-open-type-private.hh \ hb-open-type-private.hh \
@ -82,7 +82,7 @@ if HAVE_FREETYPE
HBCFLAGS += $(FREETYPE_CFLAGS) HBCFLAGS += $(FREETYPE_CFLAGS)
HBLIBS += $(FREETYPE_LIBS) HBLIBS += $(FREETYPE_LIBS)
HBSOURCES += \ HBSOURCES += \
hb-ft.cc \ hb-ft.c \
$(NULL) $(NULL)
HBHEADERS += \ HBHEADERS += \
hb-ft.h \ hb-ft.h \

View File

@ -10,7 +10,7 @@ cd "$srcdir"
for x in *.h *.hh ; do for x in *.h *.hh ; do
tag=`echo "$x" | tr 'a-z.-' 'A-Z_'` tag=`echo "$x" | tr 'a-z.-' 'A-Z_'`
lines=`grep "$tag" "$x" | wc -l` lines=`grep "\<$tag\>" "$x" | wc -l`
if test "x$lines" != x3; then if test "x$lines" != x3; then
echo "Ouch, header file $x does not have correct preprocessor guards" echo "Ouch, header file $x does not have correct preprocessor guards"
stat=1 stat=1

View File

@ -24,8 +24,8 @@
* Red Hat Author(s): Behdad Esfahbod * Red Hat Author(s): Behdad Esfahbod
*/ */
#ifndef HB_FONT_PRIVATE_HH #ifndef HB_FONT_PRIVATE_H
#define HB_FONT_PRIVATE_HH #define HB_FONT_PRIVATE_H
#include "hb-private.h" #include "hb-private.h"
@ -92,4 +92,4 @@ struct _hb_font_t {
HB_END_DECLS HB_END_DECLS
#endif /* HB_FONT_PRIVATE_HH */ #endif /* HB_FONT_PRIVATE_H */

View File

@ -26,7 +26,7 @@
#include "hb-private.h" #include "hb-private.h"
#include "hb-font-private.hh" #include "hb-font-private.h"
#include "hb-blob-private.h" #include "hb-blob-private.h"
#include "hb-open-file-private.hh" #include "hb-open-file-private.hh"

View File

@ -29,7 +29,7 @@
#include "hb-ft.h" #include "hb-ft.h"
#include "hb-font-private.hh" #include "hb-font-private.h"
#include FT_TRUETYPE_TABLES_H #include FT_TRUETYPE_TABLES_H

View File

@ -29,7 +29,7 @@
#include <graphite/GrConstants.h> #include <graphite/GrConstants.h>
#include <graphite/Segment.h> #include <graphite/Segment.h>
#include "hb-buffer-private.hh" #include "hb-buffer-private.hh"
#include "hb-font-private.hh" #include "hb-font-private.h"
#include "hb-graphite.h" #include "hb-graphite.h"
#include <map> #include <map>

View File

@ -29,7 +29,7 @@
#include "hb-ot-layout-common-private.hh" #include "hb-ot-layout-common-private.hh"
#include "hb-font-private.hh" #include "hb-font-private.h"
/* /*

View File

@ -32,7 +32,7 @@
#include "hb-ot-layout.h" #include "hb-ot-layout.h"
#include "hb-ot-head-private.hh" #include "hb-ot-head-private.hh"
#include "hb-font-private.hh" #include "hb-font-private.h"
#include "hb-buffer-private.hh" #include "hb-buffer-private.hh"