equal
deleted
inserted
replaced
1 # HG changeset patch |
|
2 # Date 1270816624 -7200 |
|
3 # User Wolfgang Rosenauer <wr@rosenauer.org> |
|
4 # Parent b2b5137c9473108008a9ff0fd1f858aa400040e8 |
|
5 Bug 558299 - ipc does not build with system nspr. |
|
6 |
|
7 diff --git a/ipc/chromium/src/base/basictypes.h b/ipc/chromium/src/base/basictypes.h |
|
8 --- a/ipc/chromium/src/base/basictypes.h |
|
9 +++ b/ipc/chromium/src/base/basictypes.h |
|
10 @@ -14,29 +14,29 @@ |
|
11 #error You_must_include_basictypes.h_before_prtypes.h! |
|
12 #endif |
|
13 |
|
14 #ifndef NO_NSPR_10_SUPPORT |
|
15 #define NO_NSPR_10_SUPPORT |
|
16 #define NO_NSPR_10_SUPPORT_SAVE |
|
17 #endif |
|
18 |
|
19 -#include "nspr/prtypes.h" |
|
20 +#include "prtypes.h" |
|
21 |
|
22 #ifdef NO_NSPR_10_SUPPORT_SAVE |
|
23 #undef NO_NSPR_10_SUPPORT_SAVE |
|
24 #undef NO_NSPR_10_SUPPORT |
|
25 #endif |
|
26 |
|
27 #ifdef _WIN32 |
|
28 #undef _WIN32 |
|
29 #define _WIN32_SAVE |
|
30 #endif |
|
31 |
|
32 -#include "nspr/obsolete/protypes.h" |
|
33 +#include "obsolete/protypes.h" |
|
34 |
|
35 #define _INT32 |
|
36 #define _UINT32 |
|
37 |
|
38 #ifdef _WIN32_SAVE |
|
39 #undef _WIN32_SAVE |
|
40 #define _WIN32 |
|
41 #endif |
|