aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2009-06-03 21:02:16 +0000
committerDJ Delorie <dj@redhat.com>2009-06-03 21:02:16 +0000
commit8466c6d4d39ac880edc6c44e60585517c20e4068 (patch)
tree7e88633e1ea67911fc5ce2e1830867c111206043
parentc121c67179b6efad582135a65934f7a01fe7cdfc (diff)
downloadgdb-8466c6d4d39ac880edc6c44e60585517c20e4068.zip
gdb-8466c6d4d39ac880edc6c44e60585517c20e4068.tar.gz
gdb-8466c6d4d39ac880edc6c44e60585517c20e4068.tar.bz2
merge from gcc
-rw-r--r--include/ChangeLog4
-rw-r--r--include/ansidecl.h12
2 files changed, 16 insertions, 0 deletions
diff --git a/include/ChangeLog b/include/ChangeLog
index 93308e8..1af04e8 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-02 Ian Lance Taylor <iant@google.com>
+
+ * ansidecl.h (EXPORTED_CONST): Define.
+
2009-05-31 Ian Lance Taylor <iant@google.com>
* ansidecl.h: Add extern "C" when compiling with C++. Treat C++
diff --git a/include/ansidecl.h b/include/ansidecl.h
index c83b8c0..f9864cd 100644
--- a/include/ansidecl.h
+++ b/include/ansidecl.h
@@ -395,6 +395,18 @@ So instead we use the macro below and test it against specific values. */
#define __extension__
#endif
+/* This is used to declare a const variable which should be visible
+ outside of the current compilation unit. Use it as
+ EXPORTED_CONST int i = 1;
+ This is because the semantics of const are different in C and C++.
+ "extern const" is permitted in C but it looks strange, and gcc
+ warns about it when -Wc++-compat is not used. */
+#ifdef __cplusplus
+#define EXPORTED_CONST extern const
+#else
+#define EXPORTED_CONST const
+#endif
+
#ifdef __cplusplus
}
#endif