diff options
Diffstat (limited to 'libdwfl')
| -rw-r--r-- | libdwfl/ChangeLog | 7 | ||||
| -rw-r--r-- | libdwfl/linux-kernel-modules.c | 20 |
2 files changed, 19 insertions, 8 deletions
diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index 27c5d6ef..bc627fee 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,4 +1,9 @@ -2015-10-11 Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> +2016-11-23 Mark Wielaard <mjw@redhat.com> + + * linux-kernel-modules.c: Only include fts.h early if BAD_FTS is + defined. + +2016-10-11 Akihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp> * core-file.c: Remove sys/param.h. * dwfl_segment_report_module.c: Likewise. Add system.h include. diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c index 54c0b908..9cd8ea93 100644 --- a/libdwfl/linux-kernel-modules.c +++ b/libdwfl/linux-kernel-modules.c @@ -26,10 +26,12 @@ the GNU Lesser General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -/* We include this before config.h because it can't handle _FILE_OFFSET_BITS. +/* In case we have a bad fts we include this before config.h because it + can't handle _FILE_OFFSET_BITS. Everything we need here is fine if its declarations just come first. */ - -#include <fts.h> +#ifdef BAD_FTS + #include <fts.h> +#endif #include <config.h> @@ -44,11 +46,15 @@ #include <fcntl.h> #include <unistd.h> -/* Since fts.h is included before config.h, its indirect inclusions may not +/* If fts.h is included before config.h, its indirect inclusions may not give us the right LFS aliases of these functions, so map them manually. */ -#ifdef _FILE_OFFSET_BITS -#define open open64 -#define fopen fopen64 +#ifdef BAD_FTS + #ifdef _FILE_OFFSET_BITS + #define open open64 + #define fopen fopen64 + #endif +#else + #include <fts.h> #endif |