Adapt to changes in newlib's sys/cdefs.h:
* include/sys/sysinfo.h (struct sysinfo): Rename __unused member to __f. * libc/fts.c (__FBSDID): Drop definition. * regex/regexec.c (__unused): Drop definition.
This commit is contained in:
parent
9770af188f
commit
a1467f6434
@ -1,3 +1,10 @@
|
||||
2013-04-22 Corinna Vinschen <corinna@vinschen.de>
|
||||
|
||||
Adapt to changes in newlib's sys/cdefs.h:
|
||||
* include/sys/sysinfo.h (struct sysinfo): Rename __unused member to __f.
|
||||
* libc/fts.c (__FBSDID): Drop definition.
|
||||
* regex/regexec.c (__unused): Drop definition.
|
||||
|
||||
2013-04-22 Corinna Vinschen <corinna@vinschen.de>
|
||||
|
||||
* include/cygwin/version.h (CYGWIN_VERSION_DLL_MINOR): Bump to 19.
|
||||
|
@ -1,6 +1,6 @@
|
||||
/* sys/sysinfo.h
|
||||
|
||||
Copyright 2009, 2011 Red Hat, Inc.
|
||||
Copyright 2009, 2011, 2013 Red Hat, Inc.
|
||||
|
||||
This file is part of Cygwin.
|
||||
|
||||
@ -30,7 +30,7 @@ struct sysinfo {
|
||||
unsigned long totalhigh; /* Total high memory size */
|
||||
unsigned long freehigh; /* Available high memory size */
|
||||
unsigned int mem_unit; /* Memory unit size in bytes */
|
||||
char __unused[10]; /* Pads structure to 64 bytes */
|
||||
char __f[10]; /* Pads structure to 64 bytes */
|
||||
};
|
||||
|
||||
extern int sysinfo (struct sysinfo *);
|
||||
|
@ -37,7 +37,6 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
|
||||
#ifdef __CYGWIN__
|
||||
#include "winsup.h"
|
||||
#include <sys/statfs.h>
|
||||
#define __FBSDID(x)
|
||||
#define _open open
|
||||
#define _close close
|
||||
#endif
|
||||
|
@ -62,10 +62,6 @@ __FBSDID("$FreeBSD: src/lib/libc/regex/regexec.c,v 1.8 2007/06/11 03:05:54 delph
|
||||
#include "utils.h"
|
||||
#include "regex2.h"
|
||||
|
||||
#ifdef __CYGWIN__
|
||||
#define __unused __attribute__ ((unused))
|
||||
#endif
|
||||
|
||||
static int nope __unused = 0; /* for use in asserts; shuts lint up */
|
||||
|
||||
static __inline size_t
|
||||
|
Loading…
Reference in New Issue
Block a user