From 4b92cf80c7d99fb86454ea989ccf9ff9d379180c Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Tue, 10 Oct 2000 03:58:32 +0000
Subject: [PATCH] provide `export "C"' guard only for default fterror handling.

---
 builds/toplevel.mk          |  2 +-
 include/freetype/fterrors.h | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/builds/toplevel.mk b/builds/toplevel.mk
index 9411164fd..fb2c5dd00 100644
--- a/builds/toplevel.mk
+++ b/builds/toplevel.mk
@@ -29,7 +29,7 @@
 .PHONY: setup
 
 ifndef CONFIG_MK
-CONFIG_MK := config.mk
+  CONFIG_MK := config.mk
 endif
 
 # If no configuration sub-makefile is present, or if `setup' is the target
diff --git a/include/freetype/fterrors.h b/include/freetype/fterrors.h
index 2fa9489da..950bb7a65 100644
--- a/include/freetype/fterrors.h
+++ b/include/freetype/fterrors.h
@@ -37,6 +37,9 @@
   /*     #include <freetype/fterrors.h>                                    */
   /*   }                                                                   */
   /*                                                                       */
+  /* For C++ it might be necessary to use `extern "C" {' and to define     */
+  /* FT_NEED_EXTERN_C also.                                                */
+  /*                                                                       */
   /*************************************************************************/
 
 
@@ -44,10 +47,7 @@
 #define FTERRORS_H
 
 
-#ifdef __cplusplus
-  extern "C" {
-#endif
-
+#undef FT_NEED_EXTERN_C
 
 #ifndef FT_ERRORDEF
 
@@ -55,6 +55,12 @@
 #define FT_ERROR_START_LIST     enum {
 #define FT_ERROR_END_LIST       FT_Err_Max };
 
+
+#ifdef __cplusplus
+#define FT_NEED_EXTERN_C
+  extern "C" {
+#endif
+
 #endif /* !FT_ERRORDEF */
 
 
@@ -186,7 +192,7 @@
 #undef FT_ERRORDEF
 
 
-#ifdef __cplusplus
+#ifdef FT_NEED_EXTERN_C
   }
 #endif