diff options
| author | <shinichiro.hamaji@gmail.com> | 2013-02-18 10:56:53 +0000 |
|---|---|---|
| committer | <shinichiro.hamaji@gmail.com> | 2013-02-18 10:56:53 +0000 |
| commit | 478a80caa0cf072d73e268d0bea46428b328943c (patch) | |
| tree | 3cf77346f68c0669c55b97e3fbc5fa8a14be1f98 /src/googletest.h | |
| parent | a106e61178d55c4d3b296c332d3f8c1eb43bcc1e (diff) | |
| download | glog-478a80caa0cf072d73e268d0bea46428b328943c.tar.gz glog-478a80caa0cf072d73e268d0bea46428b328943c.tar.bz2 glog-478a80caa0cf072d73e268d0bea46428b328943c.zip | |
Attempt to improve mingw-w64 support
- Set -Isrc/windows for mingw
- Check existence of sigaction, pread, and pwrite
- Provide alternative implementation of pread and pwrite
- Eliminate symlink code for OS_WINDOWS
- Don't check /proc/self/fd if the OS isn't linux
- Don't use MSVC specific declarations in port.h for mingw
git-svn-id: https://google-glog.googlecode.com/svn/trunk@135 eb4d4688-79bd-11dd-afb4-1d65580434c0
Diffstat (limited to 'src/googletest.h')
| -rw-r--r-- | src/googletest.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/googletest.h b/src/googletest.h index b3e26c4..21e4f64 100644 --- a/src/googletest.h +++ b/src/googletest.h @@ -81,7 +81,7 @@ static inline string GetTempDir() { #endif } -#ifdef OS_WINDOWS +#if defined(OS_WINDOWS) && defined(_MSC_VER) // The test will run in glog/vsproject/<project name> // (e.g., glog/vsproject/logging_unittest). static const char TEST_SRC_DIR[] = "../.."; |