diff options
Diffstat (limited to 'lib/common/BoxConfig-MSVC.h')
-rw-r--r-- | lib/common/BoxConfig-MSVC.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/common/BoxConfig-MSVC.h b/lib/common/BoxConfig-MSVC.h index bb3ffb30..bfa0dcaf 100644 --- a/lib/common/BoxConfig-MSVC.h +++ b/lib/common/BoxConfig-MSVC.h @@ -76,6 +76,12 @@ /* Define to 1 if you have the <execinfo.h> header file. */ /* #undef HAVE_EXECINFO_H */ +<<<<<<< HEAD +======= +/* Define to 1 if you have the <fcntl.h> header file. */ +#define HAVE_FCNTL_H 1 + +>>>>>>> 0.12 /* Define to 1 if you have the `flock' function. */ /* #undef HAVE_FLOCK */ @@ -182,7 +188,11 @@ /* Define to 1 if you have the `setproctitle' function. */ /* #undef HAVE_SETPROCTITLE */ +<<<<<<< HEAD +======= +#define HAVE_SETPROCTITLE 1 +>>>>>>> 0.12 /* Define to 1 if you have the `setxattr' function. */ /* #undef HAVE_SETXATTR */ |