mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
Update Gnulib; add new modules; remove `round' module.
This updates Gnulib to v0.0-4951-g6ff7b70. * m4/gnulib-cache.m4: Add floor, ceil, frexp, and ldexp. Add wchar as an explicit dependency; it had been present as an indirect dependency before, but no longer. Remove round, which I had requested earlier, but turned out to be unnecessary.
This commit is contained in:
parent
df12979562
commit
dd36ce77cd
31 changed files with 885 additions and 728 deletions
34
lib/flock.c
34
lib/flock.c
|
@ -27,13 +27,13 @@
|
|||
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
|
||||
|
||||
/* _get_osfhandle */
|
||||
#include <io.h>
|
||||
# include <io.h>
|
||||
|
||||
/* LockFileEx */
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
# define WIN32_LEAN_AND_MEAN
|
||||
# include <windows.h>
|
||||
|
||||
#include <errno.h>
|
||||
# include <errno.h>
|
||||
|
||||
/* Determine the current size of a file. Because the other braindead
|
||||
* APIs we'll call need lower/upper 32 bit pairs, keep the file size
|
||||
|
@ -47,9 +47,9 @@ file_size (HANDLE h, DWORD * lower, DWORD * upper)
|
|||
}
|
||||
|
||||
/* LOCKFILE_FAIL_IMMEDIATELY is undefined on some Windows systems. */
|
||||
#ifndef LOCKFILE_FAIL_IMMEDIATELY
|
||||
# define LOCKFILE_FAIL_IMMEDIATELY 1
|
||||
#endif
|
||||
# ifndef LOCKFILE_FAIL_IMMEDIATELY
|
||||
# define LOCKFILE_FAIL_IMMEDIATELY 1
|
||||
# endif
|
||||
|
||||
/* Acquire a lock. */
|
||||
static BOOL
|
||||
|
@ -160,17 +160,17 @@ flock (int fd, int operation)
|
|||
|
||||
#else /* !Windows */
|
||||
|
||||
#ifdef HAVE_STRUCT_FLOCK_L_TYPE
|
||||
# ifdef HAVE_STRUCT_FLOCK_L_TYPE
|
||||
/* We know how to implement flock in terms of fcntl. */
|
||||
|
||||
#include <fcntl.h>
|
||||
# include <fcntl.h>
|
||||
|
||||
#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
# ifdef HAVE_UNISTD_H
|
||||
# include <unistd.h>
|
||||
# endif
|
||||
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
# include <errno.h>
|
||||
# include <string.h>
|
||||
|
||||
int
|
||||
flock (int fd, int operation)
|
||||
|
@ -211,10 +211,10 @@ flock (int fd, int operation)
|
|||
return r;
|
||||
}
|
||||
|
||||
#else /* !HAVE_STRUCT_FLOCK_L_TYPE */
|
||||
# else /* !HAVE_STRUCT_FLOCK_L_TYPE */
|
||||
|
||||
#error "This platform lacks flock function, and Gnulib doesn't provide a replacement. This is a bug in Gnulib."
|
||||
# error "This platform lacks flock function, and Gnulib doesn't provide a replacement. This is a bug in Gnulib."
|
||||
|
||||
#endif /* !HAVE_STRUCT_FLOCK_L_TYPE */
|
||||
# endif /* !HAVE_STRUCT_FLOCK_L_TYPE */
|
||||
|
||||
#endif /* !Windows */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue