This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "C-Utils Repository". The branch, master has been updated via 712c3fb64e02d7a92cb8aa6043c363f78f9e8a2f (commit) from aa01f6f32835adb1f8ef1ab593c74e452449430f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 712c3fb64e02d7a92cb8aa6043c363f78f9e8a2f Author: Phil Carns <[email protected]> Date: Mon Mar 26 14:54:15 2012 -0400 temporarily break config.h dependency ----------------------------------------------------------------------- Summary of changes: triton-base.h | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) Diff of changes: diff --git a/triton-base.h b/triton-base.h index 9602b6b..3a81bc0 100644 --- a/triton-base.h +++ b/triton-base.h @@ -1,8 +1,6 @@ #ifndef __TRITON_BASE_H__ #define __TRITON_BASE_H__ -#include "c-utils-config.h" - /** * triton-base.h includes important system headers and defines appropriate * macros used throughout. @@ -20,9 +18,6 @@ /* older systems have malloc in separate header */ #include <stdlib.h> -#ifdef HAVE_MALLOC_H -#include <malloc.h> -#endif /* basic system headers */ #include <stdint.h> @@ -32,6 +27,8 @@ #include <assert.h> /* macros for portable printing of 64 bit values */ +#if 0 +/* this version relies on configure-time results in config.h */ #ifndef llu #if SIZEOF_LONG_INT == 4 # define llu(x) (x) @@ -45,6 +42,22 @@ # error Unexpected sizeof(long int) #endif #endif +#else + +/* this version relies on less-portable system definitions */ +#ifndef llu +#if __WORDSIZE == 64 +# define llu(x) (unsigned long long)(x) +# define lld(x) (long long)(x) +# define SCANF_lld ld +#else +# define llu(x) (x) +# define lld(x) (x) +# define SCANF_lld lld +#endif +#endif + +#endif /* set of macros that allow us to count the number * of arguments passed into a CPP macro that takes hooks/post-receive -- C-Utils Repository