# HG changeset patch # User Sadrul Habib Chowdhury # Date 1202501929 0 # Node ID c96b34b58b85ec7d97e0ca36c546b58634164262 # Parent f5bcb58bdf561a38330abd4a6043603b169d8fbc Fix a compile error due to set_clock being defined in term.h conflicting with gstreamer. diff -r f5bcb58bdf56 -r c96b34b58b85 finch/gntlog.c --- a/finch/gntlog.c Wed Feb 06 19:44:41 2008 +0000 +++ b/finch/gntlog.c Fri Feb 08 20:18:49 2008 +0000 @@ -23,7 +23,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ -#include "internal.h" +#include "finch.h" + +#include "account.h" +#include "debug.h" +#include "log.h" +#include "notify.h" +#include "request.h" +#include "util.h" #include #include @@ -34,13 +41,6 @@ #include #include -#include "account.h" -#include "debug.h" -#include "log.h" -#include "notify.h" -#include "request.h" -#include "util.h" - #include "gntlog.h" static GHashTable *log_viewers = NULL; diff -r f5bcb58bdf56 -r c96b34b58b85 finch/libgnt/gntkeys.h --- a/finch/libgnt/gntkeys.h Wed Feb 06 19:44:41 2008 +0000 +++ b/finch/libgnt/gntkeys.h Fri Feb 08 20:18:49 2008 +0000 @@ -165,5 +165,6 @@ #undef lines #undef buttons #undef newline +#undef set_clock #endif