From c8ba100dab8949c49097f11004c09ef36ea5136f Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Sun, 13 Dec 1998 00:09:27 +0000 Subject: [PATCH] always define G_HAVE_INLINE if __cplusplus is defined, reported by Wan-Teh Sat Dec 12 19:08:59 1998 Tim Janik * configure.in: always define G_HAVE_INLINE if __cplusplus is defined, reported by Wan-Teh Chang . --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ configure.in | 4 ++++ 9 files changed, 44 insertions(+) diff --git a/ChangeLog b/ChangeLog index 888c49eab..7d1d0758f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Dec 12 19:08:59 1998 Tim Janik + + * configure.in: always define G_HAVE_INLINE if __cplusplus is + defined, reported by Wan-Teh Chang . + Thu Dec 10 21:49:39 CST 1998 Shawn T. Amundson * Released GLib 1.1.7 diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 888c49eab..7d1d0758f 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sat Dec 12 19:08:59 1998 Tim Janik + + * configure.in: always define G_HAVE_INLINE if __cplusplus is + defined, reported by Wan-Teh Chang . + Thu Dec 10 21:49:39 CST 1998 Shawn T. Amundson * Released GLib 1.1.7 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 888c49eab..7d1d0758f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sat Dec 12 19:08:59 1998 Tim Janik + + * configure.in: always define G_HAVE_INLINE if __cplusplus is + defined, reported by Wan-Teh Chang . + Thu Dec 10 21:49:39 CST 1998 Shawn T. Amundson * Released GLib 1.1.7 diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 888c49eab..7d1d0758f 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Sat Dec 12 19:08:59 1998 Tim Janik + + * configure.in: always define G_HAVE_INLINE if __cplusplus is + defined, reported by Wan-Teh Chang . + Thu Dec 10 21:49:39 CST 1998 Shawn T. Amundson * Released GLib 1.1.7 diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 888c49eab..7d1d0758f 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sat Dec 12 19:08:59 1998 Tim Janik + + * configure.in: always define G_HAVE_INLINE if __cplusplus is + defined, reported by Wan-Teh Chang . + Thu Dec 10 21:49:39 CST 1998 Shawn T. Amundson * Released GLib 1.1.7 diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 888c49eab..7d1d0758f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sat Dec 12 19:08:59 1998 Tim Janik + + * configure.in: always define G_HAVE_INLINE if __cplusplus is + defined, reported by Wan-Teh Chang . + Thu Dec 10 21:49:39 CST 1998 Shawn T. Amundson * Released GLib 1.1.7 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 888c49eab..7d1d0758f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sat Dec 12 19:08:59 1998 Tim Janik + + * configure.in: always define G_HAVE_INLINE if __cplusplus is + defined, reported by Wan-Teh Chang . + Thu Dec 10 21:49:39 CST 1998 Shawn T. Amundson * Released GLib 1.1.7 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 888c49eab..7d1d0758f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sat Dec 12 19:08:59 1998 Tim Janik + + * configure.in: always define G_HAVE_INLINE if __cplusplus is + defined, reported by Wan-Teh Chang . + Thu Dec 10 21:49:39 CST 1998 Shawn T. Amundson * Released GLib 1.1.7 diff --git a/configure.in b/configure.in index a8b7fe43c..2a91d1117 100644 --- a/configure.in +++ b/configure.in @@ -619,7 +619,11 @@ $glib_defines $glib_vacopy +#ifdef __cplusplus +#define G_HAVE_INLINE 1 +#else /* !__cplusplus */ $glib_inline +#endif /* !__cplusplus */ #define G_BYTE_ORDER $g_byte_order outfile_EOF