diff options
| author | kientzle <kientzle@FreeBSD.org> | 2009-04-12 05:33:34 +0000 |
|---|---|---|
| committer | kientzle <kientzle@FreeBSD.org> | 2009-04-12 05:33:34 +0000 |
| commit | fc11fa5eb364f981efd4df40925c0659f0315090 (patch) | |
| tree | ea7abcf2cbb02747476436a0768d0136320ece2d /lib/libarchive/archive_check_magic.c | |
| parent | 0cb01ac4efbe6bb5e86d45975514931ea0d7b400 (diff) | |
| download | FreeBSD-src-fc11fa5eb364f981efd4df40925c0659f0315090.zip FreeBSD-src-fc11fa5eb364f981efd4df40925c0659f0315090.tar.gz | |
Merge from libarchive.googlecode.com: Mostly a bunch of
corrections to the Windows support to reconcile differences
between Visual Studio and Cygwin. Includes parts of
revisions 757, 774, 787, 815, 817, 819, 820, 844, and 886.
Of particular note, r886 overhauled the UTF-8/Unicode conversions to
work correctly regardless of whether the local system uses 16-bit
or 32-bit wchar_t. (I assume that systems with 16-bit wchar_t
use UTF-16 and those with 32-bit wchar_t use UCS-4.) This revision
also added a preference for wcrtomb() (which is thread-safe) on
platforms that support it.
Diffstat (limited to 'lib/libarchive/archive_check_magic.c')
| -rw-r--r-- | lib/libarchive/archive_check_magic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libarchive/archive_check_magic.c b/lib/libarchive/archive_check_magic.c index e1d35c5..8f1fa2f 100644 --- a/lib/libarchive/archive_check_magic.c +++ b/lib/libarchive/archive_check_magic.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #ifdef HAVE_UNISTD_H #include <unistd.h> #endif -#ifdef _WIN32 +#if defined(_WIN32) && !defined(__CYGWIN__) #include <windows.h> #include <winbase.h> #endif @@ -56,7 +56,7 @@ errmsg(const char *m) static void diediedie(void) { -#if defined(_WIN32) && defined(_DEBUG) +#if defined(_WIN32) && !defined(__CYGWIN__) && defined(_DEBUG) /* Cause a breakpoint exception */ DebugBreak(); #endif |
