From d7f23839498d1f6115ad86a2df4a173206651c82 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Tue, 18 Aug 1998 01:01:54 +0000 Subject: [PATCH] if __STRICT_ANSI__ is defined, make `inline' a noop, since strict ANSI Tue Aug 18 02:46:44 1998 Tim Janik * glib.h (__STRICT_ANSI__): if __STRICT_ANSI__ is defined, make `inline' a noop, since strict ANSI rules don't permit `inline'. --- 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 +++++ glib.h | 12 ++++++++++++ glib/glib.h | 12 ++++++++++++ 10 files changed, 64 insertions(+) diff --git a/ChangeLog b/ChangeLog index e0f3a64..9749b86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Aug 18 02:46:44 1998 Tim Janik + + * glib.h (__STRICT_ANSI__): if __STRICT_ANSI__ is defined, make + `inline' a noop, since strict ANSI rules don't permit `inline'. + Mon Aug 17 15:21:42 1998 Tim Janik * grel.c: made private functions static. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index e0f3a64..9749b86 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Tue Aug 18 02:46:44 1998 Tim Janik + + * glib.h (__STRICT_ANSI__): if __STRICT_ANSI__ is defined, make + `inline' a noop, since strict ANSI rules don't permit `inline'. + Mon Aug 17 15:21:42 1998 Tim Janik * grel.c: made private functions static. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e0f3a64..9749b86 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Aug 18 02:46:44 1998 Tim Janik + + * glib.h (__STRICT_ANSI__): if __STRICT_ANSI__ is defined, make + `inline' a noop, since strict ANSI rules don't permit `inline'. + Mon Aug 17 15:21:42 1998 Tim Janik * grel.c: made private functions static. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index e0f3a64..9749b86 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Tue Aug 18 02:46:44 1998 Tim Janik + + * glib.h (__STRICT_ANSI__): if __STRICT_ANSI__ is defined, make + `inline' a noop, since strict ANSI rules don't permit `inline'. + Mon Aug 17 15:21:42 1998 Tim Janik * grel.c: made private functions static. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e0f3a64..9749b86 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Tue Aug 18 02:46:44 1998 Tim Janik + + * glib.h (__STRICT_ANSI__): if __STRICT_ANSI__ is defined, make + `inline' a noop, since strict ANSI rules don't permit `inline'. + Mon Aug 17 15:21:42 1998 Tim Janik * grel.c: made private functions static. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e0f3a64..9749b86 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Aug 18 02:46:44 1998 Tim Janik + + * glib.h (__STRICT_ANSI__): if __STRICT_ANSI__ is defined, make + `inline' a noop, since strict ANSI rules don't permit `inline'. + Mon Aug 17 15:21:42 1998 Tim Janik * grel.c: made private functions static. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e0f3a64..9749b86 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Aug 18 02:46:44 1998 Tim Janik + + * glib.h (__STRICT_ANSI__): if __STRICT_ANSI__ is defined, make + `inline' a noop, since strict ANSI rules don't permit `inline'. + Mon Aug 17 15:21:42 1998 Tim Janik * grel.c: made private functions static. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e0f3a64..9749b86 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Aug 18 02:46:44 1998 Tim Janik + + * glib.h (__STRICT_ANSI__): if __STRICT_ANSI__ is defined, make + `inline' a noop, since strict ANSI rules don't permit `inline'. + Mon Aug 17 15:21:42 1998 Tim Janik * grel.c: made private functions static. diff --git a/glib.h b/glib.h index ab4dc84..7fc2b54 100644 --- a/glib.h +++ b/glib.h @@ -166,6 +166,18 @@ #endif +/* ANSI does not permit the keyword `inline'. + */ +#if defined (__STRICT_ANSI__) +# undef inline +# ifdef __GNUC__ +# define inline __inline__ +# else /* !__GNUC__ */ +# define inline /* don't inline */ +# endif /* !__GNUC__ */ +#endif /* __STRICT_ANSI__ */ + + /* Provide macros to feature the GCC function attribute. */ #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) diff --git a/glib/glib.h b/glib/glib.h index ab4dc84..7fc2b54 100644 --- a/glib/glib.h +++ b/glib/glib.h @@ -166,6 +166,18 @@ #endif +/* ANSI does not permit the keyword `inline'. + */ +#if defined (__STRICT_ANSI__) +# undef inline +# ifdef __GNUC__ +# define inline __inline__ +# else /* !__GNUC__ */ +# define inline /* don't inline */ +# endif /* !__GNUC__ */ +#endif /* __STRICT_ANSI__ */ + + /* Provide macros to feature the GCC function attribute. */ #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) -- 2.7.4