Index: PLATFORMS
==================================================================
--- PLATFORMS
+++ PLATFORMS
@@ -8,10 +8,11 @@
  +--------------------------+--------------+----------------------+---------+
  | Linux 2.6.*              | x86          | GCC 4.4.1            | old GNU |
  | Linux 2.6.*              | x86          | GCC 4.6              | GNU     |
  | Linux 2.6.*              | x86          | LLVM/Clang r83252    | old GNU |
  | Linux 2.6.*              | x86_64       | GCC 4.4.1            | old GNU |
+ | Maemo 5                  | arm          | GCC 4.5.1            | old GNU |
  +--------------------------+--------------+----------------------+---------+
  | iPhone OS 2.2.1 - 4.2    | arm          | GCC 4.2              | Apple   |
  | Mac OS X 10.5            | ppc          | GCC 4.0 + 4.2        | Apple   |
  | Mac OS X 10.5            | ppc64        | GCC 4.0 + 4.2        | Apple   |
  | Mac OS X 10.5 - 10.6     | x86          | GCC 4.0 + 4.2        | Apple   |

Index: generators/TableGenerator.m
==================================================================
--- generators/TableGenerator.m
+++ generators/TableGenerator.m
@@ -341,16 +341,22 @@
 	    @"#define OF_UNICODE_LOWER_TABLE_SIZE 0x%X\n"
 	    @"#define OF_UNICODE_CASEFOLDING_TABLE_SIZE 0x%X\n\n",
 	    upperTableSize, lowerTableSize, casefoldingTableSize]];
 
 	[f writeString:
+	    @"#ifdef __cplusplus\n"
+	    @"extern \"C\" {\n"
+	    @"#endif\n"
 	    @"extern const of_unichar_t* const\n"
 	    @"    of_unicode_upper_table[OF_UNICODE_UPPER_TABLE_SIZE];\n"
 	    @"extern const of_unichar_t* const\n"
 	    @"    of_unicode_lower_table[OF_UNICODE_LOWER_TABLE_SIZE];\n"
 	    @"extern const of_unichar_t* const\n"
 	    @"    of_unicode_casefolding_table["
-	    @"OF_UNICODE_CASEFOLDING_TABLE_SIZE];\n"];
+	    @"OF_UNICODE_CASEFOLDING_TABLE_SIZE];\n"
+	    @"#ifdef __cplusplus\n"
+	    @"}\n"
+	    @"#endif\n"];
 
 	[pool release];
 }
 @end