diff options
| author | korbb <korbb@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-01-17 02:08:05 +0000 |
|---|---|---|
| committer | korbb <korbb@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-01-17 02:08:05 +0000 |
| commit | b87083eba0e6c6a0dd9ce7188a1c2898b3773e19 (patch) | |
| tree | 2e33e8093cd3b58ac28687e1d3506589abe2d3ea /gcc/fixinc | |
| parent | c74c4ce556e4489eaf7811d4904094dfe17b0aac (diff) | |
| download | ppe42-gcc-b87083eba0e6c6a0dd9ce7188a1c2898b3773e19.tar.gz ppe42-gcc-b87083eba0e6c6a0dd9ce7188a1c2898b3773e19.zip | |
QNX needs a bypass for limits_ifndefs
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@61417 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fixinc')
| -rw-r--r-- | gcc/fixinc/fixincl.x | 6 | ||||
| -rw-r--r-- | gcc/fixinc/inclhack.def | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/gcc/fixinc/fixincl.x b/gcc/fixinc/fixincl.x index b2bd70d594c..4f159e1fea5 100644 --- a/gcc/fixinc/fixincl.x +++ b/gcc/fixinc/fixincl.x @@ -296,10 +296,10 @@ fix = {\n\ replace = <<- _EndOfHeader_\n\ #ifndef _SYS_BYTEORDER_H\n\ #define _SYS_BYTEORDER_H\n\n\ -/* Functions to convert `short\\' and `long\\' quantities from host byte order\n\ +/* Functions to convert `short' and `long' quantities from host byte order\n\ to (internet) network byte order (i.e. big-endian).\n\n\ Written by Ron Guilmette (rfg@ncd.com).\n\n\ - This isn\\'t actually used by GCC. It is installed by fixinc.svr4.\n\n\ + This isn't actually used by GCC. It is installed by fixinc.svr4.\n\n\ For big-endian machines these functions are essentially no-ops.\n\n\ For little-endian machines, we define the functions using specialized\n\ asm sequences in cases where doing so yields better code (e.g. i386). */\n\n\ @@ -2423,7 +2423,7 @@ tSCC zLimits_IfndefsList[] = * content bypass pattern - skip fix if pattern found */ tSCC zLimits_IfndefsBypass0[] = - "ifndef[ \t]+FLT_MIN"; + "ifndef[ \t]+FLT_(MIN|MAX)"; #define LIMITS_IFNDEFS_TEST_CT 1 static tTestDesc aLimits_IfndefsTests[] = { diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index 3e7d8181ea8..fc39fbbd2b8 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -1398,12 +1398,16 @@ fix = { * comment. Fortunately, HP/UX already uses #ifndefs in limits.h; if * we find a #ifndef FLT_MIN we assume that all the required #ifndefs * are there, and we do not add them ourselves. + * + * QNX Software Systems also guards the defines, but doesn't define + * FLT_MIN. Therefore, bypass the fix for *either* guarded FLT_MIN + * or guarded FLT_MAX. */ fix = { hackname = limits_ifndefs; files = "sys/limits.h"; files = "limits.h"; - bypass = "ifndef[ \t]+FLT_MIN"; + bypass = "ifndef[ \t]+FLT_(MIN|MAX)"; c_fix = format; c_fix_arg = "#ifndef %1\n%0\n#endif"; |
