From 91e9b770c65b29f7be88093a3c59876730755883 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Fri, 11 Sep 1998 00:16:22 +0000 Subject: [PATCH] explicitely include the prototypes for inline functions to cure gcc Fri Sep 11 02:11:46 1998 Tim Janik * glib.h: explicitely include the prototypes for inline functions to cure gcc warnings for -Wmissing-prototypes. --- 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 | 30 ++++++++++++++++-------------- glib/glib.h | 30 ++++++++++++++++-------------- 10 files changed, 72 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2caee70..0384734 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Sep 11 02:11:46 1998 Tim Janik + + * glib.h: explicitely include the prototypes for inline functions + to cure gcc warnings for -Wmissing-prototypes. + Wed Sep 9 02:52:04 PDT 1998 Manish Singh * configure.in: added -posix check for NeXTStep diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 2caee70..0384734 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Fri Sep 11 02:11:46 1998 Tim Janik + + * glib.h: explicitely include the prototypes for inline functions + to cure gcc warnings for -Wmissing-prototypes. + Wed Sep 9 02:52:04 PDT 1998 Manish Singh * configure.in: added -posix check for NeXTStep diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2caee70..0384734 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Sep 11 02:11:46 1998 Tim Janik + + * glib.h: explicitely include the prototypes for inline functions + to cure gcc warnings for -Wmissing-prototypes. + Wed Sep 9 02:52:04 PDT 1998 Manish Singh * configure.in: added -posix check for NeXTStep diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 2caee70..0384734 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Fri Sep 11 02:11:46 1998 Tim Janik + + * glib.h: explicitely include the prototypes for inline functions + to cure gcc warnings for -Wmissing-prototypes. + Wed Sep 9 02:52:04 PDT 1998 Manish Singh * configure.in: added -posix check for NeXTStep diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2caee70..0384734 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Fri Sep 11 02:11:46 1998 Tim Janik + + * glib.h: explicitely include the prototypes for inline functions + to cure gcc warnings for -Wmissing-prototypes. + Wed Sep 9 02:52:04 PDT 1998 Manish Singh * configure.in: added -posix check for NeXTStep diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2caee70..0384734 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri Sep 11 02:11:46 1998 Tim Janik + + * glib.h: explicitely include the prototypes for inline functions + to cure gcc warnings for -Wmissing-prototypes. + Wed Sep 9 02:52:04 PDT 1998 Manish Singh * configure.in: added -posix check for NeXTStep diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2caee70..0384734 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Sep 11 02:11:46 1998 Tim Janik + + * glib.h: explicitely include the prototypes for inline functions + to cure gcc warnings for -Wmissing-prototypes. + Wed Sep 9 02:52:04 PDT 1998 Manish Singh * configure.in: added -posix check for NeXTStep diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2caee70..0384734 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Sep 11 02:11:46 1998 Tim Janik + + * glib.h: explicitely include the prototypes for inline functions + to cure gcc warnings for -Wmissing-prototypes. + Wed Sep 9 02:52:04 PDT 1998 Manish Singh * configure.in: added -posix check for NeXTStep diff --git a/glib.h b/glib.h index 4ce6797..f4d738b 100644 --- a/glib.h +++ b/glib.h @@ -1256,10 +1256,12 @@ void g_atexit (GVoidFunc func); /* Bit tests */ +G_INLINE_FUNC gint g_bit_nth_lsf (guint32 mask, + gint nth_bit); +#ifdef G_CAN_INLINE G_INLINE_FUNC gint g_bit_nth_lsf (guint32 mask, gint nth_bit) -#ifdef G_CAN_INLINE { do { @@ -1270,13 +1272,14 @@ g_bit_nth_lsf (guint32 mask, while (nth_bit < 32); return -1; } -#else -; -#endif +#endif /* G_CAN_INLINE */ + +G_INLINE_FUNC gint g_bit_nth_msf (guint32 mask, + gint nth_bit); +#ifdef G_CAN_INLINE G_INLINE_FUNC gint g_bit_nth_msf (guint32 mask, gint nth_bit) -#ifdef G_CAN_INLINE { if (nth_bit < 0) nth_bit = 33; @@ -1289,25 +1292,24 @@ g_bit_nth_msf (guint32 mask, while (nth_bit > 0); return -1; } -#else -; -#endif +#endif /* G_CAN_INLINE */ + +G_INLINE_FUNC guint g_bit_storage (guint number); +#ifdef G_CAN_INLINE G_INLINE_FUNC guint g_bit_storage (guint number) -#ifdef G_CAN_INLINE { register guint n_bits = 0; do { n_bits++; - number = number >> 1; - } while (number); + number >>= 1; + } + while (number); return n_bits; } -#else -; -#endif +#endif /* G_CAN_INLINE */ /* String Chunks diff --git a/glib/glib.h b/glib/glib.h index 4ce6797..f4d738b 100644 --- a/glib/glib.h +++ b/glib/glib.h @@ -1256,10 +1256,12 @@ void g_atexit (GVoidFunc func); /* Bit tests */ +G_INLINE_FUNC gint g_bit_nth_lsf (guint32 mask, + gint nth_bit); +#ifdef G_CAN_INLINE G_INLINE_FUNC gint g_bit_nth_lsf (guint32 mask, gint nth_bit) -#ifdef G_CAN_INLINE { do { @@ -1270,13 +1272,14 @@ g_bit_nth_lsf (guint32 mask, while (nth_bit < 32); return -1; } -#else -; -#endif +#endif /* G_CAN_INLINE */ + +G_INLINE_FUNC gint g_bit_nth_msf (guint32 mask, + gint nth_bit); +#ifdef G_CAN_INLINE G_INLINE_FUNC gint g_bit_nth_msf (guint32 mask, gint nth_bit) -#ifdef G_CAN_INLINE { if (nth_bit < 0) nth_bit = 33; @@ -1289,25 +1292,24 @@ g_bit_nth_msf (guint32 mask, while (nth_bit > 0); return -1; } -#else -; -#endif +#endif /* G_CAN_INLINE */ + +G_INLINE_FUNC guint g_bit_storage (guint number); +#ifdef G_CAN_INLINE G_INLINE_FUNC guint g_bit_storage (guint number) -#ifdef G_CAN_INLINE { register guint n_bits = 0; do { n_bits++; - number = number >> 1; - } while (number); + number >>= 1; + } + while (number); return n_bits; } -#else -; -#endif +#endif /* G_CAN_INLINE */ /* String Chunks -- 2.7.4