diff options
| author | kientzle <kientzle@FreeBSD.org> | 2006-11-10 06:39:46 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2006-11-10 06:39:46 +0000 |
| commit | 50bb724108b7417b0df3bbf7029c43dbd734df49 (patch) | |
| tree | f89881956f7ca553a6834444961e2cb90388cc29 /lib/libarchive/archive_string.h | |
| parent | 56ac4302e20c910a87bfc933138eb38f4c21af7a (diff) | |
| download | FreeBSD-src-50bb724108b7417b0df3bbf7029c43dbd734df49.zip FreeBSD-src-50bb724108b7417b0df3bbf7029c43dbd734df49.tar.gz | |
Portability and style fixes:
* Actually use the HAVE_<header>_H macros to conditionally include
system headers. They've been defined for a long time, but only
used in a few places. Now they're used pretty consistently
throughout.
* Fill in a lot of missing casts for conversions from void*.
Although Standard C doesn't require this, some people have been
trying to use C++ compilers with this code, and they do require it.
Bit-for-bit, the compiled object files are identical, except for
one assert() whose line number changed, so I'm pretty confident I
didn't break anything. ;-)
Diffstat (limited to 'lib/libarchive/archive_string.h')
| -rw-r--r-- | lib/libarchive/archive_string.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/libarchive/archive_string.h b/lib/libarchive/archive_string.h index c9d1c00..4012d4a 100644 --- a/lib/libarchive/archive_string.h +++ b/lib/libarchive/archive_string.h @@ -31,7 +31,9 @@ #define ARCHIVE_STRING_H_INCLUDED #include <stdarg.h> +#ifdef HAVE_STRING_H #include <string.h> +#endif /* * Basic resizable/reusable string support a la Java's "StringBuffer." |
