summaryrefslogtreecommitdiff
path: root/src/localconsts.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/localconsts.h')
-rw-r--r--src/localconsts.h5
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__