summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2010-09-08 13:41:03 +0300
committerPanu Matilainen <pmatilai@redhat.com>2010-09-08 13:41:03 +0300
commit18d1d9fc7adc98bd5429a9e11e53195eec9b52a9 (patch)
tree830f1aed88fbb4303426b9529611700751891015
parentd960e8c18764f7206ad723963f407e960dfb8ad9 (diff)
downloadrpm-18d1d9fc7adc98bd5429a9e11e53195eec9b52a9.tar.gz
rpm-18d1d9fc7adc98bd5429a9e11e53195eec9b52a9.tar.bz2
rpm-18d1d9fc7adc98bd5429a9e11e53195eec9b52a9.zip
Fix _USE_LIBIO test
- Commit 05b2d979e8097d648f91c773f2535a1f6013cb79 caused the _USE_LIBIO test in rpmio.c to always fail as <stdio.h> wasn't included yet at the time of the check, causing silent fallback to not using libio even if actually available. Which in turn revealed funky other little bugs, addressed in commits d960e8c18764f7206ad723963f407e960dfb8ad9 and be3c34dd15814d70a410b6fd646a2be7de14a1b5. Ptooey.
-rw-r--r--rpmio/rpmio.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
index 471eee30e..e515530c3 100644
--- a/rpmio/rpmio.c
+++ b/rpmio/rpmio.c
@@ -6,10 +6,6 @@
#include <stdarg.h>
#include <errno.h>
-#if HAVE_LIBIO_H && defined(_G_IO_IO_FILE_VERSION)
-#define _USE_LIBIO 1
-#endif
-
#include <rpm/rpmlog.h>
#include <rpm/rpmmacro.h>
#include <rpm/rpmfileutil.h>
@@ -20,6 +16,10 @@
#include "debug.h"
+#if HAVE_LIBIO_H && defined(_G_IO_IO_FILE_VERSION)
+#define _USE_LIBIO 1
+#endif
+
typedef struct _FDSTACK_s {
FDIO_t io;
void * fp;