*/
#include <string.h>
-#include <unistd.h>
#include <stdlib.h>
#include <errno.h>
#include <assert.h>
#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
#include <fcntl.h>
#include <sys/queue.h>
#include "sysio-symbols.h"
#ifdef HAVE_LUSTRE_HACK
-#include <syscall.h>
+#include <sys/syscall.h>
#include <native.h>
#endif
}
}
break;
-#if !(_LARGEFILE64_SOURCE || F_GETLK64 == F_GETLK)
+#if !(defined(_LARGEFILE64_SOURCE) || F_GETLK64 == F_GETLK)
case F_GETLK:
case F_SETLK:
case F_SETLKW:
{
struct intnl_stat buf;
struct flock *fl;
-#if _LARGEFILE64_SOURCE
+#ifdef _LARGEFILE64_SOURCE
struct _SYSIO_FLOCK flock64;
#endif
* Copy args to a temp and normalize.
*/
fl = va_arg(ap, struct flock *);
-#if _LARGEFILE64_SOURCE
+#ifdef _LARGEFILE64_SOURCE
flock64.l_type = fl->l_type;
flock64.l_whence = fl->l_whence;
flock64.l_start = fl->l_start;
rtn = -1;
break;
}
-#if _LARGEFILE64_SOURCE
+#ifdef _LARGEFILE64_SOURCE
/*
* Copy back. Note that the fcntl_lock call
* should have ensured that no overflow was possible.
}
break;
#endif /* !(_LARGEFILE64_SOURCE || F_GETLK64 == F_GETLK) */
-#if _LARGEFILE64_SOURCE
+#ifdef _LARGEFILE64_SOURCE
case F_GETLK64:
case F_SETLK64:
case F_SETLKW64:
fl64 = va_arg(ap, struct flock64 *);
err = _sysio_fcntl_lock(fil, cmd, fl64);
- if (err)
- rtn = -1;
+ rtn = err ? -1 : 0;
}
break;
#endif