Work around other warnings by including util.h earlier.

svn path=/trunk/yasm/; revision=1771

diff --git a/libyasm/file.c b/libyasm/file.c
index 4d45f86261b6ddda4112390e93ea5875c80794ba..403be0572a5a18b0d82e8bcb58324a0d753754a4 100644 (file)
--- a/libyasm/file.c
+++ b/libyasm/file.c
@@ -24,10 +24,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#undef HAVE_CONFIG_H
-#endif
+#include <util.h>
+/*@unused@*/ RCSID("$Id$");
 
 /* Need either unistd.h or direct.h (on Windows) to prototype getcwd() */
 #ifdef HAVE_UNISTD_H
@@ -38,10 +36,6 @@
 
 #include <ctype.h>
 
-#define YASM_LIB_INTERNAL
-#include "util.h"
-/*@unused@*/ RCSID("$Id$");
-
 #include "errwarn.h"
 #include "file.h"
 

diff --git a/modules/dbgfmts/dwarf2/dwarf2-info.c b/modules/dbgfmts/dwarf2/dwarf2-info.c
index 99bef0f85477113c5a86c3ac85b813ee1a253cb9..0ae801c7ecdd2418f60dfa0dcbc2e6ef8485ced4 100644 (file)
--- a/modules/dbgfmts/dwarf2/dwarf2-info.c
+++ b/modules/dbgfmts/dwarf2/dwarf2-info.c
@@ -24,10 +24,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#undef HAVE_CONFIG_H
-#endif
+#include <util.h>
+/*@unused@*/ RCSID("$Id$");
 
 /* Need either unistd.h or direct.h (on Windows) to prototype getcwd() */
 #ifdef HAVE_UNISTD_H
@@ -36,9 +34,6 @@
 #include <direct.h>
 #endif
 
-#include <util.h>
-/*@unused@*/ RCSID("$Id$");
-
 #define YASM_LIB_INTERNAL
 #define YASM_BC_INTERNAL
 #include <libyasm.h>