diff options
| author | Reid <reidyaro@gmail.com> | 2012-01-25 22:05:36 +0100 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2012-01-25 22:05:36 +0100 |
| commit | 8b612abb42853a22c1a9545e2c9280d154646543 (patch) | |
| tree | f466167087c2b2de4b8aa9e6d1d1986f72f84147 /src/localconsts.h | |
| parent | a913dd41df61760de6ece552f941e002251ff54c (diff) | |
| parent | d340b5a27a8f3b05d1764da9c114f5f59bd0cd46 (diff) | |
| download | plus-8b612abb42853a22c1a9545e2c9280d154646543.tar.gz plus-8b612abb42853a22c1a9545e2c9280d154646543.tar.bz2 plus-8b612abb42853a22c1a9545e2c9280d154646543.tar.xz plus-8b612abb42853a22c1a9545e2c9280d154646543.zip | |
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/localconsts.h')
| -rw-r--r-- | src/localconsts.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/localconsts.h b/src/localconsts.h index e135a4108..2d0eb5dea 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -1,6 +1,6 @@ /* * The ManaPlus Client - * Copyright (C) 2011 The ManaPlus Developers + * Copyright (C) 2011-2012 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -21,6 +21,9 @@ #ifndef __GXX_EXPERIMENTAL_CXX0X__ #undef nullptr #define nullptr 0 +#else +#undef Z_NULL +#define Z_NULL nullptr #endif #ifdef __GNUC__ |