Made gtk-doc happy in order to dist.LIBGTOP_2_14_5

2006-12-03  Benoît Dejean  <benoit@placenet.org>

	* doc/reference/libgtop-docs.xml:
	* glibtop.h:
	* include/glibtop/sysinfo.h:

	Made gtk-doc happy in order to dist.

5 files changed, 41 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 6e00e6da..3e4fbc72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2006-12-03  Benoît Dejean  <benoit@placenet.org>
 
+	* doc/reference/libgtop-docs.xml:
+	* glibtop.h:
+	* include/glibtop/sysinfo.h:
+	
+	Made gtk-doc happy in order to dist.
+
+2006-12-03  Benoît Dejean  <benoit@placenet.org>
+
 	* NEWS:
 	
 	Released 2.14.5.
diff --git a/doc/reference/libgtop-docs.xml b/doc/reference/libgtop-docs.xml
index b3eaede8..fb9f7837 100644
--- a/doc/reference/libgtop-docs.xml
+++ b/doc/reference/libgtop-docs.xml
@@ -14,6 +14,7 @@
 	    <email>martin@home-of-linux.org</email>
 	  </address>
 	</affiliation>
+      </author>
       <author>
 	<firstname>Germ&#225;n</firstname>
 	<surname>Po&#243;-Caama&#241;o</surname>
diff --git a/doc/reference/libgtop-overrides.txt b/doc/reference/libgtop-overrides.txt
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/doc/reference/libgtop-overrides.txt
diff --git a/glibtop.h b/glibtop.h
index 58cb5872..a4daa954 100644
--- a/glibtop.h
+++ b/glibtop.h
@@ -69,14 +69,15 @@ LIBGTOP_MICRO_VERSION >= (micro)))
 
 #include <glibtop/close.h>
 
+
+#ifdef HAVE_GLIBTOP_MACHINE_H
+
 struct _glibtop
 {
 	unsigned flags;
 	unsigned method;		/* Server Method */
 	unsigned error_method;		/* Error Method */
-#ifdef HAVE_GLIBTOP_MACHINE_H
 	glibtop_machine machine;	/* Machine dependent data */
-#endif
 	int input [2];			/* Pipe client <- server */
 	int output [2];			/* Pipe client -> server */
 	int socket;			/* Accepted connection of a socket */
@@ -95,6 +96,33 @@ struct _glibtop
 	pid_t pid;			/* PID of the server */
 };
 
+#else /* !HAVE_GLIBTOP_MACHINE_H */
+
+struct _glibtop
+{
+	unsigned flags;
+	unsigned method;		/* Server Method */
+	unsigned error_method;		/* Error Method */
+	int input [2];			/* Pipe client <- server */
+	int output [2];			/* Pipe client -> server */
+	int socket;			/* Accepted connection of a socket */
+	int ncpu;			/* Number of CPUs, zero if single-processor */
+	int real_ncpu;			/* Real number of CPUs. Only ncpu are monitored */
+	unsigned long os_version_code;	/* Version code of the operating system */
+	const char *name;		/* Program name for error messages */
+	const char *server_command;	/* Command used to invoke server */
+	const char *server_host;	/* Host the server should run on */
+	const char *server_user;	/* Name of the user on the target host */
+	const char *server_rsh;		/* Command used to connect to the target host */
+	unsigned long features;		/* Server is required for this features */
+	unsigned long server_port;	/* Port on which daemon is listening */
+	glibtop_sysdeps sysdeps;	/* Detailed feature list */
+	glibtop_sysdeps required;	/* Required feature list */
+	pid_t pid;			/* PID of the server */
+};
+
+#endif /* HAVE_GLIBTOP_MACHINE_H */
+
 extern glibtop *glibtop_global_server;
 
 extern const unsigned long glibtop_server_features;
diff --git a/include/glibtop/sysinfo.h b/include/glibtop/sysinfo.h
index 1c61e2bb..a7b76595 100644
--- a/include/glibtop/sysinfo.h
+++ b/include/glibtop/sysinfo.h
@@ -50,7 +50,8 @@ struct _glibtop_entry
 
 struct _glibtop_sysinfo
 {
-	guint64	flags, ncpu;
+	guint64	flags;
+	guint64 ncpu;
 	glibtop_entry cpuinfo [GLIBTOP_NCPU];
 };