JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* include/mntent.h: Only include paths.h when building for Cygwin.

Browse Source 
Add comment to explain why.
This commit is contained in:
Corinna Vinschen 2012-11-16 17:35:14 +00:00
parent 5c63c9b570
commit bd249f0177
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2012-11-16 Corinna Vinschen <corinna@vinschen.de>
* include/mntent.h: Only include paths.h when building for Cygwin.
Add comment to explain why.
2012-11-11 Corinna Vinschen <corinna@vinschen.de> 2012-11-11 Corinna Vinschen <corinna@vinschen.de>
* winbase.h: Semi-reinstantiate to workaround lack inline assembler * winbase.h: Semi-reinstantiate to workaround lack inline assembler

12
winsup/cygwin/include/mntent.h
View File

@ -1,6 +1,6 @@
/* mntent.h /* mntent.h
Copyright 1996, 1998, 1999, 2000, 2001, 2006, 2009, 2010 Red Hat, Inc. Copyright 1996, 1998, 1999, 2000, 2001, 2006, 2009, 2010, 2012 Red Hat, Inc.
This file is part of Cygwin. This file is part of Cygwin.
@ -15,8 +15,6 @@ details. */
extern "C" { extern "C" {
#endif #endif
#include <paths.h>
struct mntent struct mntent
{ {
char *mnt_fsname; char *mnt_fsname;
@ -35,6 +33,12 @@ struct mntent *getmntent_r (FILE *, struct mntent *, char *, int);
int endmntent (FILE *__filep); int endmntent (FILE *__filep);
#endif #endif
#ifdef __CYGWIN__
/* Only include paths.h if building for Cygwin. This avoids including
newlib headers when building the native tools in winsup/utils. */
#include <paths.h>
/* The following two defines are deprecated. Use the equivalent /* The following two defines are deprecated. Use the equivalent
names from paths.h instead. */ names from paths.h instead. */
#ifndef MNTTAB #ifndef MNTTAB
@ -48,6 +52,8 @@ int endmntent (FILE *__filep);
#define MOUNTED _PATH_MOUNTED #define MOUNTED _PATH_MOUNTED
#endif #endif
#endif /* __CYGWIN__ */
#ifdef __cplusplus #ifdef __cplusplus
}; };
#endif #endif