emo/sysvinit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move dovoid() macro from #ifdef__GLIBC__ to #ifdef __linux__, to match the condutions of the place where it is used. Thanks to Matias A. Fonzo for noticing.

Browse Source
This commit is contained in:
Petter Reinholdtsen 2014-01-27 21:55:57 +00:00
parent f11cdf9554
commit 52b92185de
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/Changelog
View File

@ -61,6 +61,9 @@ sysvinit (2.89dsf) UNRELEASED; urgency=low
Debian multiarch systems. Based on patch from Andrew Gregory. Debian multiarch systems. Based on patch from Andrew Gregory.
* Adjust included headers to be compatible with the musl C * Adjust included headers to be compatible with the musl C
library. Patch from Matias A. Fonzo and Dragora. library. Patch from Matias A. Fonzo and Dragora.
* Move dovoid() macro from #ifdef__GLIBC__ to #ifdef __linux__,
to match the condutions of the place where it is used. Thanks
to Matias A. Fonzo for noticing.
-- Petter Reinholdtsen <pere@hungry.com> Sun Apr 11 11:28:55 CEST 2010 -- Petter Reinholdtsen <pere@hungry.com> Sun Apr 11 11:28:55 CEST 2010

2
src/sulogin.c
View File

@ -46,7 +46,6 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#if defined(__GLIBC__) #if defined(__GLIBC__)
# include <crypt.h> # include <crypt.h>
# define dovoid(f) if ((f)){}
#endif #endif
#ifdef __linux__ #ifdef __linux__
# include <sys/statfs.h> # include <sys/statfs.h>
@ -60,6 +59,7 @@
# ifndef MNT_DETACH # ifndef MNT_DETACH
# define MNT_DETACH 2 # define MNT_DETACH 2
# endif # endif
# define dovoid(f) if ((f)){}
#endif #endif
#define BS CTRL('h') #define BS CTRL('h')