From c980f412ab05b1f8da086de713182d141f5fbb70 Mon Sep 17 00:00:00 2001
From: Shawn Wilsher <sdwilsh@shawnwilsher.com>
Date: Thu, 17 Jun 2010 15:00:02 -0700
Subject: [PATCH] Fix build issues (hackier than I'd like it to be)

--HG--
extra : rebase_source : 45ec4c69d2a3d0613cc58a4f8c8732264012d1b5
---
 dom/indexedDB/DatabaseInfo.h          | 8 ++++++++
 dom/indexedDB/IDBCursorRequest.cpp    | 1 +
 dom/indexedDB/IDBObjectStoreRequest.h | 8 +-------
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/dom/indexedDB/DatabaseInfo.h b/dom/indexedDB/DatabaseInfo.h
index e1366f2dc5ca..5d6c7a40430d 100644
--- a/dom/indexedDB/DatabaseInfo.h
+++ b/dom/indexedDB/DatabaseInfo.h
@@ -43,6 +43,8 @@
 // Only meant to be included in IndexedDB source files, not exported.
 #include "IndexedDatabase.h"
 
+#include "IDBObjectStoreRequest.h"
+
 BEGIN_INDEXEDDB_NAMESPACE
 
 struct DatabaseInfo
@@ -103,6 +105,12 @@ struct ObjectStoreInfo
                      const nsAString& aName);
 };
 
+struct IndexUpdateInfo
+{
+  IndexInfo info;
+  Key value;
+};
+
 END_INDEXEDDB_NAMESPACE
 
 #endif // mozilla_dom_indexeddb_databaseinfo_h__
diff --git a/dom/indexedDB/IDBCursorRequest.cpp b/dom/indexedDB/IDBCursorRequest.cpp
index 7c358827708e..9fce4ae1f3a5 100644
--- a/dom/indexedDB/IDBCursorRequest.cpp
+++ b/dom/indexedDB/IDBCursorRequest.cpp
@@ -55,6 +55,7 @@
 #include "nsThreadUtils.h"
 
 #include "AsyncConnectionHelper.h"
+#include "DatabaseInfo.h"
 #include "IDBEvents.h"
 #include "IDBIndexRequest.h"
 #include "IDBObjectStoreRequest.h"
diff --git a/dom/indexedDB/IDBObjectStoreRequest.h b/dom/indexedDB/IDBObjectStoreRequest.h
index 06645b1ad60e..f02f5490c515 100644
--- a/dom/indexedDB/IDBObjectStoreRequest.h
+++ b/dom/indexedDB/IDBObjectStoreRequest.h
@@ -45,7 +45,6 @@
 #include "mozilla/dom/indexedDB/IDBTransactionRequest.h"
 
 #include "nsIIDBObjectStoreRequest.h"
-#include "DatabaseInfo.h"
 
 struct JSContext;
 
@@ -53,6 +52,7 @@ BEGIN_INDEXEDDB_NAMESPACE
 
 struct ObjectStoreInfo;
 struct IndexInfo;
+struct IndexUpdateInfo;
 
 class Key
 {
@@ -205,12 +205,6 @@ private:
   PRInt64 mInt;
 };
 
-struct IndexUpdateInfo
-{
-  IndexInfo info;
-  Key value;
-};
-
 class IDBObjectStoreRequest : public IDBRequest::Generator,
                               public nsIIDBObjectStoreRequest
 {