From 422693a7cd3c882b93149a4eca96a526f34e004e Mon Sep 17 00:00:00 2001
From: "R. Bernstein" <rocky@gnu.org>
Date: Sat, 3 Mar 2012 00:26:20 -0500
Subject: [PATCH] Change headers as per pbatard branch to make MinGW work out.

---
 test/driver/nrg.c.in | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/test/driver/nrg.c.in b/test/driver/nrg.c.in
index f7d9c7b7..49ff2ca0 100644
--- a/test/driver/nrg.c.in
+++ b/test/driver/nrg.c.in
@@ -18,13 +18,9 @@
 /* 
    Regression test for Nero image driver: lib/driver/image/nrg.c.
 */
-#include <cdio/cdio.h>
-#include <cdio/logging.h>
-#include <cdio/cdtext.h>
-
-#if defined(HAVE_CONFIG_H) && !defined(__CDIO_CONFIG_H__)
-# include "config.h"
-# define __CDIO_CONFIG_H__ 1
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#define __CDIO_CONFIG_H__ 1
 #endif
 
 #ifdef HAVE_STDIO_H
@@ -40,6 +36,9 @@
 #include <string.h>
 #endif
 
+#include <cdio/cdio.h>
+#include <cdio/logging.h>
+#include <cdio/cdtext.h>
 #include "helper.h"
 
 #ifndef DATA_DIR