diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-06-19 00:07:23 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-06-19 00:07:23 +0000 |
| commit | 7002776572e651843e3e7f7e429ccf13fea1ece5 (patch) | |
| tree | 593809b9d0b8c5957cfc6c99ddb8538b37f2f05c /config.h.win32 | |
| parent | 641a9fbf4787de71d4f9eb2d59b864920ae29bb3 (diff) | |
| download | wireshark-7002776572e651843e3e7f7e429ccf13fea1ece5.tar.gz wireshark-7002776572e651843e3e7f7e429ccf13fea1ece5.tar.bz2 wireshark-7002776572e651843e3e7f7e429ccf13fea1ece5.zip | |
Pick up the stuff I did for tcpdump to figure out the right strings to
use to format 64-bit integers.
Fix the RSVP dissector to use that rather than hardcoding "%ll" in.
Remove the "only if G_HAVE_GINT64 is defined" bit from the discussion of
64-bit integers - we're too dependent on having them to support
compilers that don't have a 64-bit integral data type. Do, however,
note that neither "long" nor "long long" are acceptable, and also note
that you shouldn't assume "%ll" does the trick for printing them.
svn path=/trunk/; revision=11182
Diffstat (limited to 'config.h.win32')
| -rw-r--r-- | config.h.win32 | 41 |
1 files changed, 40 insertions, 1 deletions
diff --git a/config.h.win32 b/config.h.win32 index d84d9ccc31..c040e018f9 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -1,4 +1,4 @@ -/* $Id: config.h.win32,v 1.45 2004/05/09 10:03:36 guy Exp $ */ +/* $Id: config.h.win32,v 1.46 2004/06/19 00:07:22 guy Exp $ */ /* config.h.win32 Generated manually. :-) */ /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ @@ -118,6 +118,45 @@ /* Define if you have the <unistd.h> header file. */ /* #define HAVE_UNISTD_H 1 */ +/* Define if <inttypes.h> defines PRI[doxu]64 macros */ +/* #define INTTYPES_H_DEFINES_FORMATS */ + +/* Format for printing 64-bit signed decimal numbers */ +#ifndef PRId64 +#ifdef _MSC_EXTENSIONS +#define PRId64 "i64d" +#else /* _MSC_EXTENSIONS */ +#define PRId64 "lld" +#endif /* _MSC_EXTENSIONS */ +#endif /* PRId64 */ + +/* Format for printing 64-bit unsigned octal numbers */ +#ifndef PRIo64 +#ifdef _MSC_EXTENSIONS +#define PRIo64 "i64o" +#else /* _MSC_EXTENSIONS */ +#define PRIo64 "llo" +#endif /* _MSC_EXTENSIONS */ +#endif /* PRIo64 */ + +/* Format for printing 64-bit unsigned decimal numbers */ +#ifndef PRIu64 +#ifdef _MSC_EXTENSIONS +#define PRIu64 "i64u" +#else /* _MSC_EXTENSIONS */ +#define PRIu64 "llu" +#endif /* _MSC_EXTENSIONS */ +#endif /* PRIu64 */ + +/* Format for printing 64-bit unsigned hexadecimal numbers */ +#ifndef PRIx64 +#ifdef _MSC_EXTENSIONS +#define PRIx64 "i64x" +#else /* _MSC_EXTENSIONS */ +#define PRIx64 "llx" +#endif /* _MSC_EXTENSIONS */ +#endif /* PRIx64 */ + /* Define if you have the z library (-lz). */ @HAVE_LIBZ@ |