diff options
| author | Chris Dyer <cdyer@cs.cmu.edu> | 2012-05-27 15:34:57 -0400 |
|---|---|---|
| committer | Chris Dyer <cdyer@cs.cmu.edu> | 2012-05-27 15:34:57 -0400 |
| commit | 3b2b7e1fa0b5e95010b5b3353a176c0eb84be938 (patch) | |
| tree | f255199de0800ec99ae58892ea274bd674fb8a87 /klm/util | |
| parent | 71c4918f05a4b380dfaebfabcc1847c1c6d497dd (diff) | |
| parent | 6fd22244aaa33cd5cbc4d9bd1003e6eef7b6e418 (diff) | |
Merge branch 'master' of github.com:redpony/cdec
Diffstat (limited to 'klm/util')
| -rw-r--r-- | klm/util/file.cc | 3 | ||||
| -rw-r--r-- | klm/util/mmap.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/klm/util/file.cc b/klm/util/file.cc index 1bd056fc..6a3885a7 100644 --- a/klm/util/file.cc +++ b/klm/util/file.cc @@ -10,11 +10,12 @@ #include <sys/stat.h> #include <fcntl.h> #include <stdint.h> -#include <unistd.h> #if defined(_WIN32) || defined(_WIN64) #include <windows.h> #include <io.h> +#else +#include <unistd.h> #endif namespace util { diff --git a/klm/util/mmap.cc b/klm/util/mmap.cc index e0d2570b..576fd4cc 100644 --- a/klm/util/mmap.cc +++ b/klm/util/mmap.cc @@ -14,12 +14,12 @@ #include <sys/types.h> #include <sys/stat.h> #include <stdlib.h> -#include <unistd.h> #if defined(_WIN32) || defined(_WIN64) #include <windows.h> #include <io.h> #else +#include <unistd.h> #include <sys/mman.h> #endif |