summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2016-05-21 10:58:40 +0200
committerWerner Lemberg <wl@gnu.org>2016-05-21 10:58:40 +0200
commit6e80a098e787c82be6be69844f71cfe61a1daa5d (patch)
tree2b6c5eaa4d45edf7176f238c20b7be3fa0140be8
parent2a4c823f89cd9bd01cf9ccc8bcefc976ce06e32a (diff)
downloadfreetype2-6e80a098e787c82be6be69844f71cfe61a1daa5d.tar.gz
Work around a bug of the C 8.0.0.1 compiler on AIX 5.3 (#47955).
* include/freetype/internal/ftmemory.h (cplusplus_typeof): Use braces for `extern "C++"'.
-rw-r--r--ChangeLog7
-rw-r--r--include/freetype/internal/ftmemory.h4
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index fb6ee881c..130f5e7c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-05-21 Werner Lemberg <wl@gnu.org>
+
+ Work around a bug of the C 8.0.0.1 compiler on AIX 5.3 (#47955).
+
+ * include/freetype/internal/ftmemory.h (cplusplus_typeof): Use
+ braces for `extern "C++"'.
+
2016-05-17 Nikolaus Waxweiler <madigens@gmail.com>
[truetype] Make TT_LOADER_SET_PP support subpixel hinting [3/3].
diff --git a/include/freetype/internal/ftmemory.h b/include/freetype/internal/ftmemory.h
index 3157dafa6..8c06fc21a 100644
--- a/include/freetype/internal/ftmemory.h
+++ b/include/freetype/internal/ftmemory.h
@@ -65,13 +65,15 @@ FT_BEGIN_HEADER
#ifdef __cplusplus
- extern "C++"
+extern "C++"
+{
template <typename T> inline T*
cplusplus_typeof( T*,
void *v )
{
return static_cast <T*> ( v );
}
+}
#define FT_ASSIGNP( p, val ) (p) = cplusplus_typeof( (p), (val) )