28 lines
989 B
Diff
28 lines
989 B
Diff
|
From 8507eb20b64010b26f23822cbf442bb0bf96511c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Emil Renner Berthing <systemd@esmil.dk>
|
||
|
|
Date: Fri, 19 Sep 2014 20:26:53 +0200
|
||
|
|
Subject: [PATCH] util: avoid non-portable __WORDSIZE
|
||
|
|
|
||
|
|
Lets not unnecessarily rely on __WORDSIZE, which is not clearly specified
|
||
|
|
by any spec. Use explicit size comparisons if we're not interested in the
|
||
|
|
WORDSIZE, anyway.
|
||
|
|
|
||
|
|
(David: adjust commit message to explain why we do this)
|
||
|
|
---
|
||
|
|
src/shared/util.h | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/shared/util.h b/src/shared/util.h
|
||
|
|
index a1d5657237..21a90a40e5 100644
|
||
|
|
--- a/src/shared/util.h
|
||
|
|
+++ b/src/shared/util.h
|
||
|
|
@@ -205,7 +205,7 @@ int safe_atod(const char *s, double *ret_d);
|
||
|
|
|
||
|
|
int safe_atou8(const char *s, uint8_t *ret);
|
||
|
|
|
||
|
|
-#if __WORDSIZE == 32
|
||
|
|
+#if LONG_MAX == INT_MAX
|
||
|
|
static inline int safe_atolu(const char *s, unsigned long *ret_u) {
|
||
|
|
assert_cc(sizeof(unsigned long) == sizeof(unsigned));
|
||
|
|
return safe_atou(s, (unsigned*) ret_u);
|