diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-29 17:19:20 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-30 00:01:35 +0100 |
| commit | ffa7f7b8ac6c6cb292f6b115c0601ac11d7a8f16 (patch) | |
| tree | bc3b7bd84239dec7af9c556313737947985d3fe0 | |
| parent | 3dadfa5afb21f0c7a4095726050c8ff386aaa356 (diff) | |
connectivity: mozabdrv: avoid warning C4005 macro redefinition
Both winnls.h (included via windows.h) and mozilla nsCharTraits.h
define macro IS_HIGH_SURROGATE/IS_LOW_SURROGATE; it turns out that
the nsEmbedAPI.h that drags in winodws.h is apparently unused.
Change-Id: If5189c58dc1fe3a508a360a270337f97333e0ce8
| -rw-r--r-- | connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h index d5e74f83005f..935ac3cb0aed 100644 --- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h +++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h @@ -39,7 +39,6 @@ #pragma disable_warn // somewhere in the files included directly or indirectly in nsString.h, warnings are enabled, again #endif -#include "nsEmbedAPI.h" #include "nsDirectoryService.h" |