From eeb3c014684bea8126616c1259f76be1d8adc81b Mon Sep 17 00:00:00 2001 From: jsteube Date: Mon, 7 Nov 2016 15:02:34 +0100 Subject: [PATCH] Fix locking.c warnings when compiling on windows --- include/locking.h | 9 --------- src/locking.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/include/locking.h b/include/locking.h index c36745c9d..5e6a30ff7 100644 --- a/include/locking.h +++ b/include/locking.h @@ -13,16 +13,7 @@ #include #include -#if defined (F_SETLKW) - int lock_file (FILE *fp); void unlock_file (FILE *fp); -#else - -#define lock_file(dummy) 0 -#define unlock_file(dummy) - -#endif - #endif // _LOCKING_H diff --git a/src/locking.c b/src/locking.c index fbf207ede..2c8464d46 100644 --- a/src/locking.c +++ b/src/locking.c @@ -38,4 +38,18 @@ void unlock_file (FILE *fp) fcntl (fileno (fp), F_SETLK, &lock); } +#else + +int lock_file (MAYBE_UNUSED FILE *fp) +{ + // we should put windows specific code here + + return 0; +} + +void unlock_file (MAYBE_UNUSED FILE *fp) +{ + // we should put windows specific code here +} + #endif // F_SETLKW