From: Andre Noll <maan@systemlinux.org>
Date: Sun, 23 May 2010 06:34:56 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: v0.4.3~20^2~2
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=ffb2eaa90429f6d5c3d369509efcdf91c5463dad;hp=6c51ff2d5a9ac7cec547d48f8d24f3d38cd6415f

Merge branch 'maint'
---

diff --git a/string.c b/string.c
index 05febebf..c228c24c 100644
--- a/string.c
+++ b/string.c
@@ -521,9 +521,9 @@ __printf_2_3 int para_printf(struct para_buffer *b, const char *fmt, ...)
 	}
 }
 
-/** \cond LLONG_MAX and LLONG_LIN might not be defined. */
+/** \cond LLONG_MAX and LLONG_MIN might not be defined. */
 #ifndef LLONG_MAX
-#define LLONG_MAX (1 << (sizeof(long) - 1))
+#define LLONG_MAX 9223372036854775807LL
 #endif
 #ifndef LLONG_MIN
 #define LLONG_MIN (-LLONG_MAX - 1LL)