mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-02 10:00:54 +00:00
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:
parent
f6fce3c1ef
commit
289270d3f8
@ -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_
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user