Fixing bad merges for bug 313309

Original committer: benjamin%smedbergs.us
Original revision: 1.8
Original date: 2006/03/03 13:57:09
This commit is contained in:
benjamin%smedbergs.us 2006-07-18 18:02:07 +00:00
parent f6fce3c1ef
commit 289270d3f8

View File

@ -101,6 +101,9 @@ protected:
nsTArray<PRInt64> mFolders;
};
#ifndef MOZILLA_1_8_BRANCH
NS_DEFINE_STATIC_IID_ACCESSOR(nsNavHistoryQuery, NS_NAVHISTORYQUERY_IID)
#endif
// nsNavHistoryQueryOptions
@ -166,5 +169,9 @@ private:
PRUint32 mMaxResults;
};
#ifndef MOZILLA_1_8_BRANCH
NS_DEFINE_STATIC_IID_ACCESSOR(nsNavHistoryQueryOptions, NS_NAVHISTORYQUERYOPTIONS_IID)
#endif
#endif // nsNavHistoryQuery_h_