diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-12 18:45:05 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:18:28 -0500 |
| commit | daff791c273cb3970add7abdb586745bb816db2a (patch) | |
| tree | bba9da72161f9c1782526aa66752511b763e6877 /source4/lib/replace | |
| parent | d5ef649e2003d9dc01beac5f0d55f0977c3ed9b1 (diff) | |
| download | samba-daff791c273cb3970add7abdb586745bb816db2a.tar.gz samba-daff791c273cb3970add7abdb586745bb816db2a.tar.bz2 samba-daff791c273cb3970add7abdb586745bb816db2a.zip | |
r18432: ensure roken doesn't try to include both inttypes.h and stdint.h. The
two conflict on irix.
(This used to be commit 4dd949c80d4400c3a80571cc28f599c37c1fcf7b)
Diffstat (limited to 'source4/lib/replace')
| -rw-r--r-- | source4/lib/replace/replace.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source4/lib/replace/replace.h b/source4/lib/replace/replace.h index 0c37b60feb..a7ad58dd56 100644 --- a/source4/lib/replace/replace.h +++ b/source4/lib/replace/replace.h @@ -53,6 +53,9 @@ #ifdef HAVE_STDINT_H #include <stdint.h> +/* force off HAVE_INTTYPES_H so that roken doesn't try to include both, + which causes a warning storm on irix */ +#undef HAVE_INTTYPES_H #elif HAVE_INTTYPES_H #include <inttypes.h> #endif |