Merge branch 'maint' into next

debian
Theodore Ts'o 2016-03-21 13:21:03 -04:00
commit b42b7bae73
2 changed files with 14 additions and 0 deletions

View File

@ -9,6 +9,14 @@
* %End-Header%
*/
/* define BSD_SOURCE to make sure we get the major() macro */
#ifndef _BSD_SOURCE
#define _BSD_SOURCE
#endif
#ifndef _DEFAULT_SOURCE
#define _DEFAULT_SOURCE /* since glibc 2.20 _SVID_SOURCE is deprecated */
#endif
#include "config.h"
#include <stdio.h>
#if HAVE_UNISTD_H
@ -38,6 +46,9 @@
#endif /* HAVE_GETMNTINFO */
#include <string.h>
#include <sys/stat.h>
#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include "ext2_fs.h"
#include "ext2fs.h"

View File

@ -12,6 +12,9 @@
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
#endif
#ifndef _DEFAULT_SOURCE
#define _DEFAULT_SOURCE /* since glibc 2.20 _SVID_SOURCE is deprecated */
#endif
#include "config.h"