Got rid of G_GNUC_INTERNAL.

svn path=/trunk/; revision=2600

7 files changed, 36 insertions, 37 deletions

diff --git a/include/glibtop/error.h b/include/glibtop/error.h
index eebe7114..9d64ff87 100644
--- a/include/glibtop/error.h
+++ b/include/glibtop/error.h
@@ -31,20 +31,20 @@
 
 G_BEGIN_DECLS
 
-void glibtop_error_vr (glibtop *server, const char *format, va_list args) G_GNUC_INTERNAL G_GNUC_NORETURN;
-void glibtop_warn_vr (glibtop *server, const char *format, va_list args) G_GNUC_INTERNAL;
-void glibtop_error_io_vr (glibtop *server, const char *format, int, va_list args) G_GNUC_INTERNAL G_GNUC_NORETURN;
-void glibtop_warn_io_vr (glibtop *server, const char *format, int, va_list args) G_GNUC_INTERNAL;
-
-void glibtop_error_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
-void glibtop_warn_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);
-void glibtop_error_io_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
-void glibtop_warn_io_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);
-
-void glibtop_error (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
-void glibtop_warn (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2);
-void glibtop_error_io (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
-void glibtop_warn_io (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2);
+void glibtop_error_vr (glibtop *server, const char *format, va_list args) G_GNUC_NORETURN;
+void glibtop_warn_vr (glibtop *server, const char *format, va_list args);
+void glibtop_error_io_vr (glibtop *server, const char *format, int, va_list args) G_GNUC_NORETURN;
+void glibtop_warn_io_vr (glibtop *server, const char *format, int, va_list args);
+
+void glibtop_error_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
+void glibtop_warn_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
+void glibtop_error_io_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;
+void glibtop_warn_io_r (glibtop *server, const char *format, ...) G_GNUC_PRINTF(2, 3);
+
+void glibtop_error (const char *format, ...) G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
+void glibtop_warn (const char *format, ...) G_GNUC_PRINTF(1, 2);
+void glibtop_error_io (const char *format, ...) G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;
+void glibtop_warn_io (const char *format, ...) G_GNUC_PRINTF(1, 2);
 
 G_END_DECLS
 
diff --git a/src/daemon/daemon.h b/src/daemon/daemon.h
index cd9520be..0700b2a2 100644
--- a/src/daemon/daemon.h
+++ b/src/daemon/daemon.h
@@ -57,17 +57,17 @@ G_BEGIN_DECLS
 #define MSG_BUFSZ		sizeof (struct _glibtop_ipc_message)
 #define MSG_MSGSZ		(MSG_BUFSZ - sizeof (long))
 
-void handle_parent_connection (int s) G_GNUC_INTERNAL;
-void handle_slave_connection (int input, int output) G_GNUC_INTERNAL;
+void handle_parent_connection (int s);
+void handle_slave_connection (int input, int output);
 void handle_slave_command (glibtop_command *cmnd, glibtop_response *resp,
-			   const void *parameter) G_GNUC_INTERNAL ;
+			   const void *parameter);
 
 void do_output (int s, glibtop_response *resp, off_t offset,
-		size_t data_size, const void *data) G_GNUC_INTERNAL;
-int do_read (int s, void *ptr, size_t total_size) G_GNUC_INTERNAL;
+		size_t data_size, const void *data);
+int do_read (int s, void *ptr, size_t total_size);
 
-void syslog_message (int priority, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);
-void syslog_io_message (int priority, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);
+void syslog_message (int priority, const char *format, ...) G_GNUC_PRINTF(2, 3);
+void syslog_io_message (int priority, const char *format, ...) G_GNUC_PRINTF(2, 3);
 
 extern gboolean enable_debug;
 extern gboolean verbose_output;
diff --git a/sysdeps/bsd/fsusage.c b/sysdeps/bsd/fsusage.c
index db337153..78f6b432 100644
--- a/sysdeps/bsd/fsusage.c
+++ b/sysdeps/bsd/fsusage.c
@@ -27,12 +27,11 @@
 #include <stdlib.h>
 
 void
-G_GNUC_INTERNAL
 _glibtop_bsd_get_fsusage_read_write(glibtop *server,
 				      glibtop_fsusage *buf,
 				      const char *path);
 
-void G_GNUC_INTERNAL
+void
 _glibtop_bsd_get_fsusage_read_write(glibtop *server,
 				      glibtop_fsusage *buf,
 				      const char *path)
diff --git a/sysdeps/common/fsusage.c b/sysdeps/common/fsusage.c
index 15fdf78a..1936da87 100644
--- a/sysdeps/common/fsusage.c
+++ b/sysdeps/common/fsusage.c
@@ -129,7 +129,7 @@ static const unsigned long _glibtop_sysdeps_fsusage =
 void
 _glibtop_linux_get_fsusage_read_write(glibtop *server,
 				      glibtop_fsusage *buf,
-				      const char *path) G_GNUC_INTERNAL;
+				      const char *path);
 
 static inline void
 _glibtop_get_fsusage_read_write(glibtop *server,
@@ -141,7 +141,7 @@ _glibtop_get_fsusage_read_write(glibtop *server,
 
 
 #elif defined(__FreeBSD__)
-void G_GNUC_INTERNAL
+void
 _glibtop_freebsd_get_fsusage_read_write(glibtop *server,
 					glibtop_fsusage *buf,
 					const char *path);
diff --git a/sysdeps/freebsd/fsusage.c b/sysdeps/freebsd/fsusage.c
index 8b12edac..3ba82a16 100644
--- a/sysdeps/freebsd/fsusage.c
+++ b/sysdeps/freebsd/fsusage.c
@@ -22,12 +22,12 @@
 #include <stdlib.h>
 
 void
-G_GNUC_INTERNAL
+
 _glibtop_freebsd_get_fsusage_read_write(glibtop *server,
                                         glibtop_fsusage *buf,
                                         const char *path);
 
-void G_GNUC_INTERNAL
+void
 _glibtop_freebsd_get_fsusage_read_write(glibtop *server,
                                         glibtop_fsusage *buf,
                                         const char *path)
diff --git a/sysdeps/linux/fsusage.c b/sysdeps/linux/fsusage.c
index 35b21cee..435b98e1 100644
--- a/sysdeps/linux/fsusage.c
+++ b/sysdeps/linux/fsusage.c
@@ -18,7 +18,7 @@
 void
 _glibtop_linux_get_fsusage_read_write(glibtop *server,
 				      glibtop_fsusage *buf,
-				      const char *path) G_GNUC_INTERNAL;
+				      const char *path);
 
 /*
  * Linux 2.6.x
@@ -127,7 +127,7 @@ static void linux_2_4_0(glibtop *server, glibtop_fsusage *buf, const char *path)
 }
 
 
-void G_GNUC_INTERNAL
+void
 _glibtop_linux_get_fsusage_read_write(glibtop *server,
 				      glibtop_fsusage *buf,
 				      const char *path)
diff --git a/sysdeps/linux/glibtop_private.h b/sysdeps/linux/glibtop_private.h
index 74cd2737..f24f35f0 100644
--- a/sysdeps/linux/glibtop_private.h
+++ b/sysdeps/linux/glibtop_private.h
@@ -42,7 +42,7 @@ next_token(const char *p)
 }
 
 char *
-skip_token (const char *p) G_GNUC_INTERNAL;
+skip_token (const char *p);
 
 static inline char *
 skip_multiple_token (const char *p, size_t count)
@@ -63,15 +63,15 @@ skip_line (const char *p)
 
 
 unsigned long long
-get_scaled(const char *buffer, const char *key) G_GNUC_INTERNAL;
+get_scaled(const char *buffer, const char *key);
 
 
 /* aborts on error */
-void G_GNUC_INTERNAL
+void
 file_to_buffer(glibtop *server, char *buffer, const char *filename);
 
 /* return < 0 on error, otherwise 0 on success */
-int G_GNUC_INTERNAL
+int
 try_file_to_buffer(char *buffer, const char *format, ...) G_GNUC_PRINTF(2, 3);
 
 
@@ -115,15 +115,15 @@ proc_stat_after_cmd (char *p)
 
 
 unsigned long
-get_boot_time(glibtop *server) G_GNUC_INTERNAL;
+get_boot_time(glibtop *server);
 
 
 size_t
-get_page_size(void) G_GNUC_INTERNAL;
+get_page_size(void);
 
 
 gboolean
-check_cpu_line(glibtop *server, const char *line, unsigned n) G_GNUC_INTERNAL;
+check_cpu_line(glibtop *server, const char *line, unsigned n);
 
 
 static inline gboolean
@@ -143,7 +143,7 @@ check_cpu_line_warn(glibtop *server, const char *line, unsigned i)
 
 
 gboolean
-has_sysfs(void) G_GNUC_INTERNAL G_GNUC_CONST;
+has_sysfs(void) G_GNUC_CONST;
 
 gboolean safe_readlink(const char *path, char *buf, size_t bufsiz);