Bug 4351 - double #include for _BIONIC_
Summary: double #include for _BIONIC_
Status: RESOLVED FIXED
Alias: None
Product: Busybox
Classification: Unclassified
Component: Other (show other bugs)
Version: unspecified
Hardware: All Linux
: P5 trivial
Target Milestone: ---
Assignee: unassigned
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-10-21 21:41 UTC by Michael Tokarev
Modified: 2011-10-22 04:39 UTC (History)
1 user (show)

See Also:
Host:
Target:
Build:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Michael Tokarev 2011-10-21 21:41:34 UTC 
Commit 14bd16ac56e81e4912341cb731dc54af0dbe9e6c introduced a nice change:

--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -25,6 +25,9 @@
 #include "libbb.h"
 #include <mntent.h>
 #include <sys/swap.h>
+#ifndef __BIONIC__
+# include <sys/swap.h>
+#endif
 
 #if ENABLE_FEATURE_MOUNT_LABEL
 # include "volume_id.h"

So, sys/swap.h gets include twice for anything but _BIONIC_, and once for _BIONIC_.  I guess the first #include were intended to go away with introduction of the #if conditional.  Does it actually build with bionic?

Thanks,

/mjt
Comment 1 Denys Vlasenko 2011-10-22 04:39:28 UTC 
Fixed, thanks.