mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 571728 - Mismatched allocator for SuggestMgr::csconv. r=ehsan r=smaug
This commit is contained in:
parent
9b7c217009
commit
60025c3498
@ -68,10 +68,6 @@
|
|||||||
|
|
||||||
#include "csutil.hxx"
|
#include "csutil.hxx"
|
||||||
|
|
||||||
#ifdef MOZILLA_CLIENT
|
|
||||||
#include "nscore.h" // for mozalloc headers
|
|
||||||
#endif
|
|
||||||
|
|
||||||
AffixMgr::AffixMgr(const char * affpath, HashMgr** ptr, int * md, const char * key)
|
AffixMgr::AffixMgr(const char * affpath, HashMgr** ptr, int * md, const char * key)
|
||||||
{
|
{
|
||||||
// register hash manager and load affix data from aff file
|
// register hash manager and load affix data from aff file
|
||||||
|
@ -66,6 +66,10 @@
|
|||||||
#include "w_char.hxx"
|
#include "w_char.hxx"
|
||||||
#include "htypes.hxx"
|
#include "htypes.hxx"
|
||||||
|
|
||||||
|
#ifdef MOZILLA_CLIENT
|
||||||
|
#include "nscore.h" // for mozalloc headers
|
||||||
|
#endif
|
||||||
|
|
||||||
// casing
|
// casing
|
||||||
#define NOCAP 0
|
#define NOCAP 0
|
||||||
#define INITCAP 1
|
#define INITCAP 1
|
||||||
|
@ -61,9 +61,7 @@
|
|||||||
|
|
||||||
#include "hunspell.hxx"
|
#include "hunspell.hxx"
|
||||||
#include "hunspell.h"
|
#include "hunspell.h"
|
||||||
#ifdef MOZILLA_CLIENT
|
#ifndef MOZILLA_CLIENT
|
||||||
# include "nscore.h"
|
|
||||||
#else
|
|
||||||
# include "config.h"
|
# include "config.h"
|
||||||
#endif
|
#endif
|
||||||
#include "csutil.hxx"
|
#include "csutil.hxx"
|
||||||
|
@ -64,10 +64,6 @@
|
|||||||
#include "htypes.hxx"
|
#include "htypes.hxx"
|
||||||
#include "csutil.hxx"
|
#include "csutil.hxx"
|
||||||
|
|
||||||
#ifdef MOZILLA_CLIENT
|
|
||||||
#include "nscore.h" // for mozalloc headers
|
|
||||||
#endif
|
|
||||||
|
|
||||||
const w_char W_VLINE = { '\0', '|' };
|
const w_char W_VLINE = { '\0', '|' };
|
||||||
|
|
||||||
SuggestMgr::SuggestMgr(const char * tryme, int maxn,
|
SuggestMgr::SuggestMgr(const char * tryme, int maxn,
|
||||||
|
Loading…
Reference in New Issue
Block a user