diff options
| author | Martin Baulig <baulig@suse.de> | 2001-04-20 20:50:01 +0000 |
|---|---|---|
| committer | Martin Baulig <martin@src.gnome.org> | 2001-04-20 20:50:01 +0000 |
| commit | 530cc00ae76004ad5897e0c7529436aaa82eff73 (patch) | |
| tree | e75d59b1cf6c2f20b50f81b0a66998aa2076d3df | |
| parent | a3557112a7acb86671f1681599b31ce5a2d05f8b (diff) | |
| download | libgtop-530cc00ae76004ad5897e0c7529436aaa82eff73.tar.gz | |
Use G_BEGIN_DECLS and G_END_DECLS instead of LIBGTOP_BEGIN/END_DECLS.
2001-04-20 Martin Baulig <baulig@suse.de>
* include/glibtop/*.h: Use G_BEGIN_DECLS and G_END_DECLS
instead of LIBGTOP_BEGIN/END_DECLS.
49 files changed, 112 insertions, 140 deletions
@@ -1,5 +1,10 @@ 2001-04-20 Martin Baulig <baulig@suse.de> + * include/glibtop/*.h: Use G_BEGIN_DECLS and G_END_DECLS + instead of LIBGTOP_BEGIN/END_DECLS. + +2001-04-20 Martin Baulig <baulig@suse.de> + * include/glibtop/glibtop-server.h (glibtop_closure): Typedef this as an opaque struct. @@ -36,7 +36,7 @@ #include <glibtop/glibtop-client.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS typedef struct _glibtop glibtop; @@ -55,6 +55,6 @@ glibtop_init_s (glibtop_server *server_ptr, unsigned long features, unsigned flags); -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/array.h b/include/glibtop/array.h index 35da36ed..1259d27b 100644 --- a/include/glibtop/array.h +++ b/include/glibtop/array.h @@ -29,7 +29,7 @@ #include <glibtop.h> #include <glibtop/global.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_ARRAY_NUMBER 0 #define GLIBTOP_ARRAY_SIZE 1 diff --git a/include/glibtop/call-vector.h.in b/include/glibtop/call-vector.h.in index 8c02d478..1417ad16 100644 --- a/include/glibtop/call-vector.h.in +++ b/include/glibtop/call-vector.h.in @@ -31,13 +31,13 @@ #include <glibtop.h> #include <glibtop/union.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS struct _glibtop_call_vector { @@GLIBTOP_CALL_VECTOR@@ }; -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/close.h b/include/glibtop/close.h index 9a060b1d..0bc15cc6 100644 --- a/include/glibtop/close.h +++ b/include/glibtop/close.h @@ -28,13 +28,13 @@ #include <glibtop.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS void glibtop_close_r (glibtop *server); void glibtop_close_s (glibtop_server *server); void glibtop_close_p (glibtop_server *server); -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/compat_10.h b/include/glibtop/compat_10.h index 7ddb18b4..d13b9395 100644 --- a/include/glibtop/compat_10.h +++ b/include/glibtop/compat_10.h @@ -29,7 +29,7 @@ #include <glibtop.h> #include <glibtop/global.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS /* glibtop_cpu */ diff --git a/include/glibtop/cpu.h b/include/glibtop/cpu.h index e77d5f2e..19bb471c 100644 --- a/include/glibtop/cpu.h +++ b/include/glibtop/cpu.h @@ -29,7 +29,7 @@ #include <glibtop.h> #include <glibtop/global.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_CPU_TOTAL 0 #define GLIBTOP_CPU_USER 1 @@ -93,6 +93,6 @@ extern const char *glibtop_descriptions_cpu []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/error.h b/include/glibtop/error.h index 0740a824..a3c077c2 100644 --- a/include/glibtop/error.h +++ b/include/glibtop/error.h @@ -28,7 +28,7 @@ #include <glibtop.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS void glibtop_error_vr (glibtop_server *server, char *format, va_list args); void glibtop_warn_vr (glibtop_server *server, char *format, va_list args); @@ -41,6 +41,6 @@ void glibtop_warn_r (glibtop_server *server, char *format, ...); void glibtop_error_io_r (glibtop_server *server, char *format, ...); void glibtop_warn_io_r (glibtop_server *server, char *format, ...); -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/errors.h b/include/glibtop/errors.h index 9936eead..a10930ce 100644 --- a/include/glibtop/errors.h +++ b/include/glibtop/errors.h @@ -30,7 +30,7 @@ #include <gerror.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_ERROR glibtop_error_quark () @@ -90,6 +90,6 @@ void glibtop_warn_io_l (glibtop_client *client, glibtop_error code, char *format, ...); -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/fsusage.h b/include/glibtop/fsusage.h index 9120ec15..a9c43071 100644 --- a/include/glibtop/fsusage.h +++ b/include/glibtop/fsusage.h @@ -29,7 +29,7 @@ #include <glibtop.h> #include <glibtop/global.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_FSUSAGE_BLOCKS 0 #define GLIBTOP_FSUSAGE_BFREE 1 @@ -65,6 +65,6 @@ extern const char *glibtop_descriptions_fsusage []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/glib-arrays.h b/include/glibtop/glib-arrays.h index d99436be..6fa0247b 100644 --- a/include/glibtop/glib-arrays.h +++ b/include/glibtop/glib-arrays.h @@ -32,7 +32,7 @@ #include <glib.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS GPtrArray * glibtop_get_proc_args_as_array_l (glibtop_client *client, pid_t pid); @@ -46,5 +46,5 @@ glibtop_get_proc_map_as_array_l (glibtop_client *client, pid_t pid); GPtrArray * glibtop_get_mountlist_as_array_l (glibtop_client *client, int all_fs); -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/glibtop-backend-info.h b/include/glibtop/glibtop-backend-info.h index 8387d1a9..1129c475 100644 --- a/include/glibtop/glibtop-backend-info.h +++ b/include/glibtop/glibtop-backend-info.h @@ -31,7 +31,7 @@ #include <glibtop/glibtop-server.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS typedef struct _glibtop_backend_info glibtop_backend_info; typedef struct _glibtop_backend_entry glibtop_backend_entry; @@ -97,6 +97,6 @@ glibtop_backend_by_name (const char *backend_name); void glibtop_init_backends (void); -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/glibtop-backend.h b/include/glibtop/glibtop-backend.h index 73bd5c54..4816a2c2 100644 --- a/include/glibtop/glibtop-backend.h +++ b/include/glibtop/glibtop-backend.h @@ -29,7 +29,7 @@ #include <glibtop.h> #include <gobject/gobject.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_TYPE_BACKEND (glibtop_backend_get_type ()) #define GLIBTOP_BACKEND(backend) (G_TYPE_CHECK_INSTANCE_CAST ((backend), GLIBTOP_TYPE_BACKEND, glibtop_backend)) @@ -80,6 +80,6 @@ glibtop_backend_get_call_vector (glibtop_backend *backend); glibtop_server * glibtop_backend_get_server (glibtop_backend *backend); -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/glibtop-client.h b/include/glibtop/glibtop-client.h index 6a3c6c2b..bea2a8f3 100644 --- a/include/glibtop/glibtop-client.h +++ b/include/glibtop/glibtop-client.h @@ -31,7 +31,7 @@ #include <glibtop/glibtop-backend.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_TYPE_CLIENT (glibtop_client_get_type ()) #define GLIBTOP_CLIENT(client) (G_TYPE_CHECK_INSTANCE_CAST ((client), GLIBTOP_TYPE_CLIENT, glibtop_client)) @@ -91,6 +91,6 @@ void glibtop_client_remove_backend (glibtop_client *client, glibtop_backend *backend); -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/glibtop-server.h b/include/glibtop/glibtop-server.h index bbfd3e0f..42639823 100644 --- a/include/glibtop/glibtop-server.h +++ b/include/glibtop/glibtop-server.h @@ -29,7 +29,7 @@ #include <glibtop/global.h> #include <glibtop/sysdeps.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS typedef struct _glibtop_server glibtop_server; typedef struct _glibtop_server_info glibtop_server_info; @@ -70,6 +70,6 @@ glibtop_server_ref (glibtop_server *server); void glibtop_server_unref (glibtop_server *server); -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/global.h b/include/glibtop/global.h index 4f8e92e4..7a283675 100644 --- a/include/glibtop/global.h +++ b/include/glibtop/global.h @@ -30,40 +30,24 @@ #include <config.h> #endif -/* - * All declarations are enclosed in BEGIN_LIBGTOP_DECLS and - * END_LIBGTOP_DECLS so that C++ compilers don't mangle their names. - * - */ - -#undef BEGIN_LIBGTOP_DECLS -#undef END_LIBGTOP_DECLS -#ifdef __cplusplus -# define BEGIN_LIBGTOP_DECLS extern "C" { -# define END_LIBGTOP_DECLS } -#else -# define BEGIN_LIBGTOP_DECLS /* empty */ -# define END_LIBGTOP_DECLS /* empty */ +#include <stdio.h> +#include <stdlib.h> +#include <sys/param.h> + +#include <stdarg.h> + +#ifdef HAVE_UNISTD_H +#include <unistd.h> #endif -#ifdef _IN_LIBGTOP +#ifdef HAVE_MEMORY_H +#include <memory.h> +#endif -/* Provide macros to feature the GCC function attribute. - */ -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) -#define G_GNUC_NORETURN \ - __attribute__((noreturn)) -#define G_GNUC_CONST \ - __attribute__((const)) -#define G_GNUC_UNUSED \ - __attribute__((unused)) -#else /* !__GNUC__ */ -#define G_GNUC_NORETURN -#define G_GNUC_CONST -#define G_GNUC_UNUSED -#endif /* !__GNUC__ */ +#include <string.h> +#include <sys/types.h> -#endif /* _IN_LIBGTOP */ +#include <gmacros.h> #if TIME_WITH_SYS_TIME # include <sys/time.h> @@ -102,25 +86,8 @@ #endif #endif -#include <stdio.h> -#include <stdlib.h> - -#include <stdarg.h> - -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif - -#ifdef HAVE_MEMORY_H -#include <memory.h> -#endif - -#include <string.h> -#include <sys/types.h> - #ifdef _IN_LIBGTOP -#include <sys/param.h> #include <sys/socket.h> #include <sys/stat.h> @@ -131,7 +98,7 @@ #ifdef _IN_LIBGTOP -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #ifndef _ #define _(String) dgettext (LIBGTOP_PACKAGE, String) @@ -142,7 +109,7 @@ BEGIN_LIBGTOP_DECLS char *strerror (int errno); #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif /* _IN_LIBGTOP */ diff --git a/include/glibtop/inodedb.h b/include/glibtop/inodedb.h index d7199c9a..2d1999c6 100644 --- a/include/glibtop/inodedb.h +++ b/include/glibtop/inodedb.h @@ -33,7 +33,7 @@ #define GLIBTOP_INODEDB_ALL 7 -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS typedef struct _glibtop_inodedb glibtop_inodedb; @@ -60,6 +60,6 @@ glibtop_inodedb_lookup_s (glibtop_server *server, void glibtop_inodedb_close_s (glibtop_server *server, glibtop_closure *closure, glibtop_inodedb *inodedb); -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/interfaces.h b/include/glibtop/interfaces.h index d941aca8..f9cd4d4c 100644 --- a/include/glibtop/interfaces.h +++ b/include/glibtop/interfaces.h @@ -32,7 +32,7 @@ #include <glibtop/compat_10.h> #include <glibtop/array.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_INTERFACE_IF_FLAGS 0 #define GLIBTOP_INTERFACE_TRANSPORT 1 @@ -198,6 +198,6 @@ extern const char *glibtop_descriptions_interface_names []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/limits.h b/include/glibtop/limits.h index 9596ea3b..b939feff 100644 --- a/include/glibtop/limits.h +++ b/include/glibtop/limits.h @@ -28,7 +28,7 @@ #include <glibtop/global.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS /* Nobody should really be using more than 64 processors. */ #define GLIBTOP_NCPU 64 @@ -51,6 +51,6 @@ BEGIN_LIBGTOP_DECLS /* Maximum length of a backend name. */ #define GLIBTOP_BACKEND_NAME_LEN 40 -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/loadavg.h b/include/glibtop/loadavg.h index 40b9bc69..6ff2a8e4 100644 --- a/include/glibtop/loadavg.h +++ b/include/glibtop/loadavg.h @@ -29,7 +29,7 @@ #include <glibtop.h> #include <glibtop/global.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_LOADAVG_LOADAVG 0 #define GLIBTOP_LOADAVG_NR_RUNNING 1 @@ -76,6 +76,6 @@ extern const char *glibtop_descriptions_loadavg []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/mem.h b/include/glibtop/mem.h index 06f8f7ea..737efc8d 100644 --- a/include/glibtop/mem.h +++ b/include/glibtop/mem.h @@ -29,7 +29,7 @@ #include <glibtop.h> #include <glibtop/global.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_MEM_TOTAL 0 #define GLIBTOP_MEM_USED 1 @@ -84,6 +84,6 @@ extern const char *glibtop_descriptions_mem []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/mountlist.h b/include/glibtop/mountlist.h index 9f3afccc..60c46fb1 100644 --- a/include/glibtop/mountlist.h +++ b/include/glibtop/mountlist.h @@ -32,7 +32,7 @@ #include <glibtop/compat_10.h> #include <glibtop/array.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS typedef struct _glibtop_mountentry glibtop_mountentry; @@ -63,6 +63,6 @@ extern const char *glibtop_descriptions_mountlist []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/msg_limits.h b/include/glibtop/msg_limits.h index c8fc9d84..14f9d305 100644 --- a/include/glibtop/msg_limits.h +++ b/include/glibtop/msg_limits.h @@ -29,7 +29,7 @@ #include <glibtop.h> #include <glibtop/global.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_MSG_LIMITS_MSGPOOL 0 #define GLIBTOP_MSG_LIMITS_MSGMAP 1 @@ -82,7 +82,7 @@ extern const char *glibtop_descriptions_msg_limits []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/netinfo.h b/include/glibtop/netinfo.h index e2e79c64..d36fcf57 100644 --- a/include/glibtop/netinfo.h +++ b/include/glibtop/netinfo.h @@ -29,7 +29,7 @@ #include <glibtop.h> #include <glibtop/global.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_NETINFO_IF_FLAGS 0 #define GLIBTOP_NETINFO_TRANSPORT 1 @@ -78,6 +78,6 @@ extern const char *glibtop_descriptions_netinfo []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/netload.h b/include/glibtop/netload.h index c8dd0cea..1188d910 100644 --- a/include/glibtop/netload.h +++ b/include/glibtop/netload.h @@ -29,7 +29,7 @@ #include <glibtop.h> #include <glibtop/global.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_NETLOAD_PACKETS_IN 0 #define GLIBTOP_NETLOAD_PACKETS_OUT 1 @@ -90,6 +90,6 @@ extern const char *glibtop_descriptions_netload []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/open.h b/include/glibtop/open.h index cf0e7c54..9631e8a4 100644 --- a/include/glibtop/open.h +++ b/include/glibtop/open.h @@ -26,7 +26,7 @@ #include <glibtop.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define _GLIBTOP_INIT_STATE_INIT 0x10000 #define _GLIBTOP_INIT_STATE_OPEN 0x20000 @@ -76,6 +76,6 @@ _glibtop_open_sysdeps (glibtop_client *client, const char *program_name, #endif /* _IN_LIBGTOP */ -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/parameter.h b/include/glibtop/parameter.h index 8f31a3c1..c574dcaa 100644 --- a/include/glibtop/parameter.h +++ b/include/glibtop/parameter.h @@ -27,7 +27,7 @@ #include <glibtop.h> #include <glibtop/open.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_PARAM_ERROR_METHOD 1 #define GLIBTOP_PARAM_FEATURES 2 @@ -60,6 +60,6 @@ int glibtop_set_parameter_l (glibtop *server, const unsigned parameter, const void *data_ptr, size_t data_size); -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/ppp.h b/include/glibtop/ppp.h index 2f26b7cf..e046ee54 100644 --- a/include/glibtop/ppp.h +++ b/include/glibtop/ppp.h @@ -29,7 +29,7 @@ #include <glibtop.h> #include <glibtop/global.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_PPP_STATE 0 #define GLIBTOP_PPP_BYTES_IN 1 @@ -80,6 +80,6 @@ extern const char *glibtop_descriptions_ppp []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/procargs.h b/include/glibtop/procargs.h index 545e4769..aa4de181 100644 --- a/include/glibtop/procargs.h +++ b/include/glibtop/procargs.h @@ -32,7 +32,7 @@ #include <glibtop/compat_10.h> #include <glibtop/array.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #if GLIBTOP_SUID_PROC_ARGS #define glibtop_get_proc_args_r glibtop_get_proc_args_p @@ -66,6 +66,6 @@ extern const char *glibtop_descriptions_proc_args []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/proccwd.h b/include/glibtop/proccwd.h index eb900bf8..ac32cc35 100644 --- a/include/glibtop/proccwd.h +++ b/include/glibtop/proccwd.h @@ -31,7 +31,7 @@ #include <glibtop/array.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_PROC_CWD_SIZE 0 #define GLIBTOP_PROC_CWD_DEVICE 1 diff --git a/include/glibtop/prockernel.h b/include/glibtop/prockernel.h index dadcb627..2650945a 100644 --- a/include/glibtop/prockernel.h +++ b/include/glibtop/prockernel.h @@ -29,7 +29,7 @@ #include <glibtop.h> #include <glibtop/global.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_PROC_KERNEL_K_FLAGS 0 #define GLIBTOP_PROC_KERNEL_MIN_FLT 1 @@ -104,6 +104,6 @@ extern const char *glibtop_descriptions_proc_kernel []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/proclist.h b/include/glibtop/proclist.h index 23e9bac5..5d44ca67 100644 --- a/include/glibtop/proclist.h +++ b/include/glibtop/proclist.h @@ -32,7 +32,7 @@ #include <glibtop/compat_10.h> #include <glibtop/array.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS /* You can use the folowing constants as the `which' member of * glibtop_get_proclist () to specify which processes to fetch. */ @@ -87,6 +87,6 @@ extern const char *glibtop_descriptions_proclist []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/procmap.h b/include/glibtop/procmap.h index b40a7802..5d4a7d82 100644 --- a/include/glibtop/procmap.h +++ b/include/glibtop/procmap.h @@ -32,7 +32,7 @@ #include <glibtop/compat_10.h> #include <glibtop/array.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_MAP_ENTRY_START 1 #define GLIBTOP_MAP_ENTRY_END 2 @@ -92,6 +92,6 @@ extern const char *glibtop_descriptions_proc_map []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/procmem.h b/include/glibtop/procmem.h index 51f0e9a3..9ed20d7b 100644 --- a/include/glibtop/procmem.h +++ b/include/glibtop/procmem.h @@ -29,7 +29,7 @@ #include <glibtop.h> #include <glibtop/global.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_PROC_MEM_SIZE 0 #define GLIBTOP_PROC_MEM_VSIZE 1 @@ -84,6 +84,6 @@ extern const char *glibtop_descriptions_proc_mem []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/procsegment.h b/include/glibtop/procsegment.h index a64bd520..8b3892ee 100644 --- a/include/glibtop/procsegment.h +++ b/include/glibtop/procsegment.h @@ -29,7 +29,7 @@ #include <glibtop.h> #include <glibtop/global.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_PROC_SEGMENT_TEXT_RSS 0 #define GLIBTOP_PROC_SEGMENT_SHLIB_RSS 1 @@ -104,6 +104,6 @@ extern const char *glibtop_descriptions_proc_segment []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/procsignal.h b/include/glibtop/procsignal.h index 4617c823..d6ed293e 100644 --- a/include/glibtop/procsignal.h +++ b/include/glibtop/procsignal.h @@ -29,7 +29,7 @@ #include <glibtop.h> #include <glibtop/global.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_PROC_SIGNAL_SIGNAL 0 #define GLIBTOP_PROC_SIGNAL_BLOCKED 1 @@ -78,6 +78,6 @@ extern const char *glibtop_descriptions_proc_signal []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/procstate.h b/include/glibtop/procstate.h index dbd54f15..f4264a32 100644 --- a/include/glibtop/procstate.h +++ b/include/glibtop/procstate.h @@ -29,7 +29,7 @@ #include <glibtop.h> #include <glibtop/global.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_PROC_STATE_CMD 0 #define GLIBTOP_PROC_STATE_STATE 1 @@ -104,6 +104,6 @@ extern const char *glibtop_descriptions_proc_state []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/proctime.h b/include/glibtop/proctime.h index 74e40619..afd07abc 100644 --- a/include/glibtop/proctime.h +++ b/include/glibtop/proctime.h @@ -30,7 +30,7 @@ #include <glibtop/cpu.h> #include <glibtop/global.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_PROC_TIME_START_TIME 0 #define GLIBTOP_PROC_TIME_RTIME 1 @@ -101,6 +101,6 @@ extern const char *glibtop_descriptions_proc_time []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/procuid.h b/include/glibtop/procuid.h index 633b6bdd..38cf1cc3 100644 --- a/include/glibtop/procuid.h +++ b/include/glibtop/procuid.h @@ -29,7 +29,7 @@ #include <glibtop.h> #include <glibtop/global.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_PROC_UID_UID 0 #define GLIBTOP_PROC_UID_EUID 1 @@ -106,6 +106,6 @@ extern const char *glibtop_descriptions_proc_uid []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/sem_limits.h b/include/glibtop/sem_limits.h index dc8384d0..f3364e03 100644 --- a/include/glibtop/sem_limits.h +++ b/include/glibtop/sem_limits.h @@ -29,7 +29,7 @@ #include <glibtop.h> #include <glibtop/global.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_SEM_LIMITS_SEMMAP 0 #define GLIBTOP_SEM_LIMITS_SEMMNI 1 @@ -88,6 +88,6 @@ extern const char *glibtop_descriptions_sem_limits []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/shm_limits.h b/include/glibtop/shm_limits.h index 1d37ca30..11e26929 100644 --- a/include/glibtop/shm_limits.h +++ b/include/glibtop/shm_limits.h @@ -29,7 +29,7 @@ #include <glibtop.h> #include <glibtop/global.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_SHM_LIMITS_SHMMAX 0 #define GLIBTOP_SHM_LIMITS_SHMMIN 1 @@ -78,6 +78,6 @@ extern const char *glibtop_descriptions_shm_limits []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/signal.h b/include/glibtop/signal.h index 652559d8..e4d90173 100644 --- a/include/glibtop/signal.h +++ b/include/glibtop/signal.h @@ -32,7 +32,7 @@ #include <sys/signal.h> #endif -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS typedef struct _glibtop_signame glibtop_signame; @@ -44,6 +44,6 @@ struct _glibtop_signame extern const glibtop_signame glibtop_sys_siglist []; -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/swap.h b/include/glibtop/swap.h index 014846ce..7476cb63 100644 --- a/include/glibtop/swap.h +++ b/include/glibtop/swap.h @@ -29,7 +29,7 @@ #include <glibtop.h> #include <glibtop/global.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_SWAP_TOTAL 0 #define GLIBTOP_SWAP_USED 1 @@ -78,6 +78,6 @@ extern const char *glibtop_descriptions_swap []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/sysdeps.h b/include/glibtop/sysdeps.h index 65d53bd6..d559f1f9 100644 --- a/include/glibtop/sysdeps.h +++ b/include/glibtop/sysdeps.h @@ -28,7 +28,7 @@ #include <glibtop.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_SYSDEPS_CPU 0 #define GLIBTOP_SYSDEPS_MEM 1 @@ -105,6 +105,6 @@ extern const char *glibtop_descriptions_sysdeps []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/sysinfo.h b/include/glibtop/sysinfo.h index 230d4276..3329ba0e 100644 --- a/include/glibtop/sysinfo.h +++ b/include/glibtop/sysinfo.h @@ -32,7 +32,7 @@ #include <glib.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_SYSINFO_CPUINFO 0 @@ -59,6 +59,6 @@ struct _glibtop_sysinfo glibtop_sysinfo *glibtop_get_sysinfo_s (glibtop_server *server); -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/types.h b/include/glibtop/types.h index d8f6ec9f..21753ae7 100644 --- a/include/glibtop/types.h +++ b/include/glibtop/types.h @@ -26,7 +26,7 @@ #ifndef __GLIBTOP_TYPES_H__ #define __GLIBTOP_TYPES_H__ -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_TYPE_LONG 1 #define GLIBTOP_TYPE_ULONG 2 @@ -36,6 +36,6 @@ BEGIN_LIBGTOP_DECLS #define GLIBTOP_TYPE_CHAR 6 #define GLIBTOP_TYPE_STRING 7 -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/union.h b/include/glibtop/union.h index 24b0d569..c18bfc51 100644 --- a/include/glibtop/union.h +++ b/include/glibtop/union.h @@ -56,7 +56,7 @@ #include <glibtop/interfaces.h> #include <glibtop/ppp.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS typedef union _glibtop_union glibtop_union; @@ -89,6 +89,6 @@ union _glibtop_union glibtop_ppp ppp; }; -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/uptime.h b/include/glibtop/uptime.h index 61a82b0c..46048e1b 100644 --- a/include/glibtop/uptime.h +++ b/include/glibtop/uptime.h @@ -29,7 +29,7 @@ #include <glibtop.h> #include <glibtop/global.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS #define GLIBTOP_UPTIME_UPTIME 0 #define GLIBTOP_UPTIME_IDLETIME 1 @@ -74,6 +74,6 @@ extern const char *glibtop_descriptions_uptime []; #endif -END_LIBGTOP_DECLS +G_END_DECLS #endif diff --git a/include/glibtop/xmalloc.h b/include/glibtop/xmalloc.h index 657fd865..fe85c8e4 100644 --- a/include/glibtop/xmalloc.h +++ b/include/glibtop/xmalloc.h @@ -29,7 +29,7 @@ #include <glibtop.h> #include <glibtop/error.h> -BEGIN_LIBGTOP_DECLS +G_BEGIN_DECLS void *glibtop_malloc_r (glibtop_server *server, size_t size); void *glibtop_calloc_r (glibtop_server *server, size_t nmemb, size_t size); @@ -37,6 +37,6 @@ void *glibtop_realloc_r (glibtop_server *server, void *ptr, size_t size); char *glibtop_strdup_r (glibtop_server *server, const char *string); void glibtop_free_r (glibtop_server *server, const void *ptr); -END_LIBGTOP_DECLS +G_END_DECLS #endif |