diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9bdad8eabf..97c1fda69c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-01  Pedro Alves  <palves@redhat.com>
+
+	* jit-reader.in (plugin_is_GPL_compatible): Add declarations for
+	both __cplusplus and !__cplusplus.
+
 2012-03-01  Pedro Alves  <palves@redhat.com>
 
 	* psymtab.c (find_and_open_source): Delete declaration.
diff --git a/gdb/jit-reader.in b/gdb/jit-reader.in
index ccc68e4927..42c28b52ce 100644
--- a/gdb/jit-reader.in
+++ b/gdb/jit-reader.in
@@ -36,6 +36,7 @@ extern "C" {
 #ifdef __cplusplus
 #define GDB_DECLARE_GPL_COMPATIBLE_READER       \
   extern "C" {                                  \
+  extern int plugin_is_GPL_compatible (void);   \
   extern int plugin_is_GPL_compatible (void)    \
   {                                             \
     return 0;                                   \
@@ -45,6 +46,7 @@ extern "C" {
 #else
 
 #define GDB_DECLARE_GPL_COMPATIBLE_READER
+  extern int plugin_is_GPL_compatible (void);   \
   extern int plugin_is_GPL_compatible (void)    \
   {                                             \
     return 0;                                   \