Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-04 15:51:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1329593 - Compiling with mingw-w64 is broken with conflict-with-previous-declaration errors. r=gcp

Browse Source 
--HG--
extra : rebase_source : 07e5b745c371aeca4de55abd2a99b61c915113f0
This commit is contained in:
Dimi Lee 2017-01-12 23:00:22 +08:00
parent 3a31e3f62d
commit 2dae4fbcea
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
toolkit/components/url-classifier/nsUrlClassifierDBService.h
View File

@ -25,6 +25,13 @@
#include "Entries.h"
#include "LookupCache.h"
// GCC < 6.1 workaround, see bug 1329593
#if defined(XP_WIN) && defined(__MINGW32__)
#define GCC_MANGLING_WORKAROUND __stdcall
#else
#define GCC_MANGLING_WORKAROUND
#endif
// The hash length for a domain key.
#define DOMAIN_LENGTH 4
@ -167,10 +174,10 @@ public:
LookupResultArray* results);
// Open the DB connection
nsresult OpenDb();
nsresult GCC_MANGLING_WORKAROUND OpenDb();
// Provide a way to forcibly close the db connection.
nsresult CloseDb();
nsresult GCC_MANGLING_WORKAROUND CloseDb();
nsresult CacheCompletions(CacheResultArray * aEntries);
nsresult CacheMisses(PrefixArray * aEntries);