diff options
Diffstat (limited to 'fixincludes')
| -rw-r--r-- | fixincludes/ChangeLog | 6 | ||||
| -rw-r--r-- | fixincludes/fixincl.x | 10 | ||||
| -rw-r--r-- | fixincludes/inclhack.def | 13 | ||||
| -rw-r--r-- | fixincludes/tests/base/stdint.h | 13 |
4 files changed, 15 insertions, 27 deletions
diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog index 37258669eed..5ba356d40f6 100644 --- a/fixincludes/ChangeLog +++ b/fixincludes/ChangeLog @@ -1,3 +1,9 @@ +2009-10-21 Steve Ellcey <sje@cup.hp.com> + + * inclhack.def (hpux_stdint_least_fast): Simplify. + * fixincl.x: Regenerate. + * tests/base/stdint.h: Update. + 2009-09-15 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * inclhack.def (isc_fmod, isc_omits_with_stdc) diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x index b9b9b040f4d..2d6e1fcd9cf 100644 --- a/fixincludes/fixincl.x +++ b/fixincludes/fixincl.x @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (fixincl.x) * - * It has been AutoGen-ed Tuesday September 15, 2009 at 06:55:13 AM CEST + * It has been AutoGen-ed Tuesday October 20, 2009 at 04:21:49 PM PDT * From the definitions inclhack.def * and the template file fixincl */ -/* DO NOT SVN-MERGE THIS FILE, EITHER Di 15. Sep 06:55:13 CEST 2009 +/* DO NOT SVN-MERGE THIS FILE, EITHER Tue Oct 20 16:21:49 PDT 2009 * * You must regenerate it. Use the ./genfixes script. * @@ -4082,11 +4082,7 @@ static tTestDesc aHpux_Stdint_Least_FastTests[] = { */ static const char* apzHpux_Stdint_Least_FastPatch[] = { "format", - "#ifdef __LP64__\n\ -# define\tUINT_%164_MAX\tULONG_MAX\n\ -#else\n\ -%0\n\ -#endif", + "# define\tUINT_%164_MAX\t__UINT64_MAX__", (char*)NULL }; /* * * * * * * * * * * * * * * * * * * * * * * * * * diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index 72841b31f7a..da4a94ce9f9 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -2213,16 +2213,9 @@ fix = { select = "^[ \t]*#[ \t]*define[ \t]+UINT_(LEAST|FAST)64_MAX[ \t]+ULLONG_MAX"; c_fix = format; - c-fix-arg = <<- _EOFix_ - #ifdef __LP64__ - # define UINT_%164_MAX ULONG_MAX - #else - %0 - #endif - _EOFix_; - test-text = <<- _EOFix_ - # define UINT_FAST64_MAX ULLONG_MAX - # define UINT_LEAST64_MAX ULLONG_MAX + c-fix-arg = "# define UINT_%164_MAX __UINT64_MAX__"; + test-text = "# define UINT_FAST64_MAX ULLONG_MAX\n" + "# define UINT_LEAST64_MAX ULLONG_MAX\n"; _EOFix_; }; diff --git a/fixincludes/tests/base/stdint.h b/fixincludes/tests/base/stdint.h index 1c59442182f..3159505f3c3 100644 --- a/fixincludes/tests/base/stdint.h +++ b/fixincludes/tests/base/stdint.h @@ -146,16 +146,9 @@ #if defined( HPUX_STDINT_LEAST_FAST_CHECK ) -#ifdef __LP64__ -# define UINT_FAST64_MAX ULONG_MAX -#else -# define UINT_FAST64_MAX ULLONG_MAX -#endif -#ifdef __LP64__ -# define UINT_LEAST64_MAX ULONG_MAX -#else -# define UINT_LEAST64_MAX ULLONG_MAX -#endif +# define UINT_FAST64_MAX __UINT64_MAX__ +# define UINT_LEAST64_MAX __UINT64_MAX__ + #endif /* HPUX_STDINT_LEAST_FAST_CHECK */ |