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 | b15fdf3b770eae3052a43ab3d19b1ff5ea9eca76 (patch) | |
| tree | 6a2e84d4294133d11076adbda8a4c3de1ea8a8b7 /klm | |
| parent | bfa5c4866101161c5fb20220d335c80ed075ae0a (diff) | |
| parent | 6c3912d888580a41f0f98211507feaa1c92d422e (diff) | |
Merge branch 'master' of github.com:redpony/cdec
Diffstat (limited to 'klm')
| -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 |