Rename LONG_LONG to ULONG_LONG and change it to return unsigned long long

[strace] / defs.h

diff --git a/defs.h b/defs.h
index 7869f9078b31ac758e2b64a9e2ccd74fa16d84a0..2aea10409ce7618a7c51ac4dce0c12a59adab0ae 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -562,11 +562,11 @@ extern int print_quoted_string(const char *, unsigned int, unsigned int);
  * b refers to the higher numbered u_arg
  */
 #ifdef WORDS_BIGENDIAN
-# define LONG_LONG(a,b) \
-       ((long long)((unsigned long long)(unsigned)(b) | ((unsigned long long)(a)<<32)))
+# define ULONG_LONG(a,b) \
+       ((unsigned long long)(unsigned)(b) | ((unsigned long long)(a)<<32))
 #else
-# define LONG_LONG(a,b) \
-       ((long long)((unsigned long long)(unsigned)(a) | ((unsigned long long)(b)<<32)))
+# define ULONG_LONG(a,b) \
+       ((unsigned long long)(unsigned)(a) | ((unsigned long long)(b)<<32))
 #endif
 extern int getllval(struct tcb *, unsigned long long *, int);
 extern int printllval(struct tcb *, const char *, int)