diff --git a/ChangeLog b/ChangeLog index 7c109b18..504c00a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +1999-02-18 Martin Baulig + + * sysdeps/common/error.h: Replaced inline with static. + 1999-02-18 Martin Baulig * */*.awk: Replaced all awk scripts with perl scripts since it is diff --git a/include/glibtop/error.h b/include/glibtop/error.h index 5806d351..90c98748 100644 --- a/include/glibtop/error.h +++ b/include/glibtop/error.h @@ -33,14 +33,7 @@ extern void glibtop_warn_vr __P((glibtop *, char *, va_list)); extern void glibtop_error_io_vr __P((glibtop *, char *, gint, va_list)); extern void glibtop_warn_io_vr __P((glibtop *, char *, gint, va_list)); -G_INLINE_FUNC void glibtop_error_r __P((glibtop *, char *, ...)); -G_INLINE_FUNC void glibtop_warn_r __P((glibtop *, char *, ...)); - -G_INLINE_FUNC void glibtop_error_io_r __P((glibtop *, char *, ...)); -G_INLINE_FUNC void glibtop_warn_io_r __P((glibtop *, char *, ...)); - -#ifdef G_CAN_INLINE -G_INLINE_FUNC void +static void glibtop_error_r (glibtop *server, char *format, ...) { va_list args; @@ -50,7 +43,7 @@ glibtop_error_r (glibtop *server, char *format, ...) va_end (args); } -G_INLINE_FUNC void +static void glibtop_warn_r (glibtop *server, char *format, ...) { va_list args; @@ -60,7 +53,7 @@ glibtop_warn_r (glibtop *server, char *format, ...) va_end (args); } -G_INLINE_FUNC void +static void glibtop_error_io_r (glibtop *server, char *format, ...) { va_list args; @@ -70,7 +63,7 @@ glibtop_error_io_r (glibtop *server, char *format, ...) va_end (args); } -G_INLINE_FUNC void +static void glibtop_warn_io_r (glibtop *server, char *format, ...) { va_list args; @@ -79,7 +72,6 @@ glibtop_warn_io_r (glibtop *server, char *format, ...) glibtop_warn_io_vr (server, format, errno, args); va_end (args); } -#endif #ifdef __GNUC__ diff --git a/sysdeps/common/error.c b/sysdeps/common/error.c index f7772675..f967c2ea 100644 --- a/sysdeps/common/error.c +++ b/sysdeps/common/error.c @@ -84,47 +84,3 @@ glibtop_warn_io_vr (glibtop *server, char *format, gint error, va_list args) abort (); #endif } - -#ifndef G_CAN_INLINE - -G_INLINE_FUNC void -glibtop_error_r (glibtop *server, char *format, ...) -{ - va_list args; - - va_start (args, format); - glibtop_error_vr (server, format, args); - va_end (args); -} - -G_INLINE_FUNC void -glibtop_warn_r (glibtop *server, char *format, ...) -{ - va_list args; - - va_start (args, format); - glibtop_warn_vr (server, format, args); - va_end (args); -} - -G_INLINE_FUNC void -glibtop_error_io_r (glibtop *server, char *format, ...) -{ - va_list args; - - va_start (args, format); - glibtop_error_io_vr (server, format, errno, args); - va_end (args); -} - -G_INLINE_FUNC void -glibtop_warn_io_r (glibtop *server, char *format, ...) -{ - va_list args; - - va_start (args, format); - glibtop_warn_io_vr (server, format, errno, args); - va_end (args); -} - -#endif /* not G_CAN_INLINE */