diff options
| author | Charles Wilson <cwilso11@gmail.com> | 2009-03-17 23:43:12 -0400 |
|---|---|---|
| committer | Charles Wilson <cwilso11@gmail.com> | 2009-03-17 23:43:12 -0400 |
| commit | 44f9eb572bca6ac07112a794776928d02913e551 (patch) | |
| tree | 67fb9a4921f2a170da390edf72348677b2c88442 /libarchive/archive_check_magic.c | |
| parent | 525697361c65f08088f8d18ecbf8ab131f90cae0 (diff) | |
| download | libarchive-44f9eb572bca6ac07112a794776928d02913e551.tar.gz | |
Issue 15, part 1. Mechanical conversion of #defines, libarchive/
#ifdef _WIN32 --> #if defined(_WIN32) && !defined(__CYGWIN__)
#ifndef _WIN32 --> #if !defined(_WIN32) || defined(__CYGWIN__)
Exceptions to the general rule:
libarchive/archive.h: we want declspec for both
libarchive/archive_entry.h: ditto
libarchive/archive_write_disk.c: we want to fix backslashs,
and to use cleanup_pathname_win on both.
SVN-Revision: 787
Diffstat (limited to 'libarchive/archive_check_magic.c')
| -rw-r--r-- | libarchive/archive_check_magic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libarchive/archive_check_magic.c b/libarchive/archive_check_magic.c index 4cce5aa3..7a19087f 100644 --- a/libarchive/archive_check_magic.c +++ b/libarchive/archive_check_magic.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD: src/lib/libarchive/archive_check_magic.c,v 1.9 2008/12/06 05 #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 |