diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-01-21 01:26:07 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-01-21 01:26:07 +0300 |
| commit | 98dabed4de60bc86522632379f2499aecbae2b70 (patch) | |
| tree | 48924b90447eb513f330c1e82d9afbab3719525e /src/localconsts.h | |
| parent | ec6db5f3d8b7f0b725fec0b4d8d71b330aa034c6 (diff) | |
| download | manaplus-98dabed4de60bc86522632379f2499aecbae2b70.tar.gz manaplus-98dabed4de60bc86522632379f2499aecbae2b70.tar.bz2 manaplus-98dabed4de60bc86522632379f2499aecbae2b70.tar.xz manaplus-98dabed4de60bc86522632379f2499aecbae2b70.zip | |
Fix compilation errors and warnings for another gcc 4.7 snapshot.
Diffstat (limited to 'src/localconsts.h')
| -rw-r--r-- | src/localconsts.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/localconsts.h b/src/localconsts.h index 4a8bb062a..2d0eb5dea 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -21,6 +21,9 @@ #ifndef __GXX_EXPERIMENTAL_CXX0X__ #undef nullptr #define nullptr 0 +#else +#undef Z_NULL +#define Z_NULL nullptr #endif #ifdef __GNUC__ |