From: Michael Orlitzky Date: Thu, 19 Feb 2009 07:06:03 +0000 (-0500) Subject: Fixed build with --enable-debug=full thanks to Evgeni Golov. X-Git-Tag: v0.0.6~9 X-Git-Url: https://gitweb.michael.orlitzky.com/?a=commitdiff_plain;h=f96fd73099713a39795b0b32c418f2af8818a96a;p=xfce4-hdaps.git Fixed build with --enable-debug=full thanks to Evgeni Golov. Added declaration of hdaps_reset_timeout in xfce4-hdaps.h. Rearranged some header #includes. --- diff --git a/panel-plugin/hdaps.c b/panel-plugin/hdaps.c index cb5e459..3fd30a6 100644 --- a/panel-plugin/hdaps.c +++ b/panel-plugin/hdaps.c @@ -26,8 +26,9 @@ #include #include #include -#include #include +#include +#include #include "hdaps.h" /* The most space we expect to need when reading in diff --git a/panel-plugin/hdaps.h b/panel-plugin/hdaps.h index 7672b24..70965be 100644 --- a/panel-plugin/hdaps.h +++ b/panel-plugin/hdaps.h @@ -21,6 +21,8 @@ #ifndef __HDAPS_H__ #define __HDAPS_H__ +#include + #define HDAPS_ERROR -1 #define HDAPS_OFF 0 #define HDAPS_ON 1 diff --git a/panel-plugin/xfce4-hdaps-dialogs.c b/panel-plugin/xfce4-hdaps-dialogs.c index 046beac..f716aa8 100644 --- a/panel-plugin/xfce4-hdaps-dialogs.c +++ b/panel-plugin/xfce4-hdaps-dialogs.c @@ -22,10 +22,12 @@ #include #endif +#include #include #include #include #include "xfce4-hdaps-dialogs.h" +#include "hdaps.h" /* Wild guess. Actually borrowed from some code I copy-and-pasted. Doesn't seem too ugly. */ diff --git a/panel-plugin/xfce4-hdaps-dialogs.h b/panel-plugin/xfce4-hdaps-dialogs.h index f4e85d2..e800c30 100644 --- a/panel-plugin/xfce4-hdaps-dialogs.h +++ b/panel-plugin/xfce4-hdaps-dialogs.h @@ -21,7 +21,6 @@ #ifndef __XFCE4_HDAPS_DIALOGS_H__ #define __XFCE4_HDAPS_DIALOGS_H__ -#include "hdaps.h" #include "xfce4-hdaps.h" G_BEGIN_DECLS diff --git a/panel-plugin/xfce4-hdaps.c b/panel-plugin/xfce4-hdaps.c index e545326..29ee3b2 100644 --- a/panel-plugin/xfce4-hdaps.c +++ b/panel-plugin/xfce4-hdaps.c @@ -22,6 +22,7 @@ #include #endif +#include "hdaps.h" #include "xfce4-hdaps.h" #include "xfce4-hdaps-dialogs.h" diff --git a/panel-plugin/xfce4-hdaps.h b/panel-plugin/xfce4-hdaps.h index cd4aa44..65e545e 100644 --- a/panel-plugin/xfce4-hdaps.h +++ b/panel-plugin/xfce4-hdaps.h @@ -25,7 +25,6 @@ #include #include #include -#include "hdaps.h" G_BEGIN_DECLS @@ -64,6 +63,8 @@ typedef struct { void hdaps_save(XfcePanelPlugin *plugin, HdapsPlugin *hdaps); +void hdaps_reset_timeout(HdapsPlugin *hdaps); + G_END_DECLS #endif