diff options
| author | shiqian <shiqian@861a406c-534a-0410-8894-cb66d6ee9925> | 2008-07-08 21:32:17 +0000 |
|---|---|---|
| committer | shiqian <shiqian@861a406c-534a-0410-8894-cb66d6ee9925> | 2008-07-08 21:32:17 +0000 |
| commit | e4e9a8bd7d2dbbad62030c8f80513e3c81b32213 (patch) | |
| tree | 08e242f8835e0688031e27305c5d58c24282f2e7 /include/gtest/internal/gtest-port.h | |
| parent | d201456903f3ecae1f7794edfab0d5678e642265 (diff) | |
| download | googletest-e4e9a8bd7d2dbbad62030c8f80513e3c81b32213.tar.gz googletest-e4e9a8bd7d2dbbad62030c8f80513e3c81b32213.tar.bz2 googletest-e4e9a8bd7d2dbbad62030c8f80513e3c81b32213.zip | |
Makes the autotools scripts work on Mac OS X. Also hopefully makes gtest compile on Windows CE.
Diffstat (limited to 'include/gtest/internal/gtest-port.h')
| -rw-r--r-- | include/gtest/internal/gtest-port.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index d441b218..4ba6d552 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -124,8 +124,6 @@ // Int32FromGTestEnv() - parses an Int32 environment variable. // StringFromGTestEnv() - parses a string environment variable. -#include <sys/types.h> - #include <stdlib.h> #include <stdio.h> @@ -215,8 +213,9 @@ #if GTEST_HAS_STD_STRING && defined(GTEST_OS_LINUX) #define GTEST_HAS_DEATH_TEST // On some platforms, <regex.h> needs someone to define size_t, and -// won't compile if being #included first. Therefore it's important -// that we #include it after <sys/types.h>. +// won't compile otherwise. We can #include it here as we already +// included <stdlib.h>, which is guaranteed to define size_t through +// <stddef.h>. #include <regex.h> #include <vector> #include <fcntl.h> |