changeset 25633:c96b34b58b85

Fix a compile error due to set_clock being defined in term.h conflicting with gstreamer.
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Fri, 08 Feb 2008 20:18:49 +0000
parents f5bcb58bdf56
children 741a702033e0
files finch/gntlog.c finch/libgnt/gntkeys.h
diffstat 2 files changed, 9 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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 <gnt.h>
 #include <gntbox.h>
@@ -34,13 +41,6 @@
 #include <gnttree.h>
 #include <gntwindow.h>
 
-#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;
--- 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