desktop-data-model r7254 - trunk/engine

[otaylor svn gnome org]

Author: otaylor
Date: Tue Feb 19 18:50:25 2008
New Revision: 7254
URL: http://svn.gnome.org/viewvc/desktop-data-model?rev=7254&view=rev

Log:
Tweak how we conditionalize on sqlite

Modified:
   trunk/engine/hippo-disk-cache.c
   trunk/engine/hippo-sqlite-utils.h

Modified: trunk/engine/hippo-disk-cache.c
==============================================================================
--- trunk/engine/hippo-disk-cache.c	(original)
+++ trunk/engine/hippo-disk-cache.c	Tue Feb 19 18:50:25 2008
@@ -7,13 +7,13 @@
 
 #ifdef HAVE_SQLITE
 #include <sqlite3.h>
+#include "hippo-sqlite-utils.h"
 #endif
 
 #include <ddm/ddm.h>
 #include "hippo-connection.h"
 #include "hippo-disk-cache.h"
 #include "hippo-data-cache.h"
-#include "hippo-sqlite-utils.h"
 
 /* How often to touch a field in the database indicating the last time the
  * current session was used

Modified: trunk/engine/hippo-sqlite-utils.h
==============================================================================
--- trunk/engine/hippo-sqlite-utils.h	(original)
+++ trunk/engine/hippo-sqlite-utils.h	Tue Feb 19 18:50:25 2008
@@ -3,15 +3,10 @@
 #define __HIPPO_SQLITE_UTILS_H__
 
 #include <glib-object.h>
-#include <ddm/ddm.h>
-#ifdef HAVE_SQLITE
 #include <sqlite3.h>
-#endif
 
 G_BEGIN_DECLS
 
-#ifdef HAVE_SQLITE
-
 gboolean
 hippo_sqlite_bind_parameter(sqlite3      *db,
 		                    sqlite3_stmt *stmt,
@@ -51,8 +46,6 @@
                                        const char     *sql,
                                        ...);
 
-#endif
-
 G_END_DECLS
 
 #endif /* __HIPPO_SQLITE_UTILS_H__ */