From 5995c6d8013789b0d18ea0419e63c8377d01734b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sun, 6 Apr 2008 18:41:07 +0200
Subject: [PATCH] Fix "#include" directives in stand-alone C tests.

---
 test-suite/ChangeLog                      |  8 ++++++++
 test-suite/standalone/test-asmobs-lib.c   |  4 ++--
 test-suite/standalone/test-conversion.c   | 10 ++++++----
 test-suite/standalone/test-gh.c           |  6 +++---
 test-suite/standalone/test-list.c         |  4 ++--
 test-suite/standalone/test-num2integral.c |  4 ++--
 test-suite/standalone/test-round.c        |  8 +++++---
 7 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/test-suite/ChangeLog b/test-suite/ChangeLog
index f662e12d2..5284f30ff 100644
--- a/test-suite/ChangeLog
+++ b/test-suite/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-06  Ludovic Courtès  <ludo@gnu.org>
+
+	* standalone/test-asmobs-lib.c, standalone/test-conversion.c,
+	standalone/test-gh.c, standalone/test-list.c,
+	standalone/test-num2integral.c, standalone/test-round.c: Make
+	sure "config.h" is included first; use angle brackets for
+	<config.h> and <libguile.h>.
+
 2008-03-13  Ludovic Courtès  <ludo@gnu.org>
 
 	* standalone/Makefile.am (test_cflags): Add `-I' flags for
diff --git a/test-suite/standalone/test-asmobs-lib.c b/test-suite/standalone/test-asmobs-lib.c
index f3d1634a2..88cf847c5 100644
--- a/test-suite/standalone/test-asmobs-lib.c
+++ b/test-suite/standalone/test-asmobs-lib.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999,2000,2001,2003, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1999,2000,2001,2003, 2006, 2008 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -15,7 +15,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libguile.h"
+#include <libguile.h>
 
 long asmob000;
 long asmob100;
diff --git a/test-suite/standalone/test-conversion.c b/test-suite/standalone/test-conversion.c
index 2e8c057fc..b8dfab8ea 100644
--- a/test-suite/standalone/test-conversion.c
+++ b/test-suite/standalone/test-conversion.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999,2000,2001,2003,2004, 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 1999,2000,2001,2003,2004, 2006, 2007, 2008 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -15,14 +15,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libguile.h"
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <libguile.h>
 
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
 
-#include "config.h"
-
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #elif (!defined PRIiMAX)
diff --git a/test-suite/standalone/test-gh.c b/test-suite/standalone/test-gh.c
index 78cf87fa5..4d91cce41 100644
--- a/test-suite/standalone/test-gh.c
+++ b/test-suite/standalone/test-gh.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999,2000,2001,2003, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1999,2000,2001,2003, 2006, 2008 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,8 +17,8 @@
 
 /* some bits originally by Jim Blandy <jimb@red-bean.com> */
 
-#include "libguile.h"
-#include "libguile/gh.h"
+#include <libguile.h>
+#include <libguile/gh.h>
 
 #include <assert.h>
 #include <string.h>
diff --git a/test-suite/standalone/test-list.c b/test-suite/standalone/test-list.c
index 7a9514ae9..3396dff83 100644
--- a/test-suite/standalone/test-list.c
+++ b/test-suite/standalone/test-list.c
@@ -1,6 +1,6 @@
 /* test-list.c - exercise libguile/list.c functions */
 
-/* Copyright (C) 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2006, 2008 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libguile.h"
+#include <libguile.h>
 
 #include <stdio.h>
 #include <assert.h>
diff --git a/test-suite/standalone/test-num2integral.c b/test-suite/standalone/test-num2integral.c
index 86c3e5db7..d2de418e9 100644
--- a/test-suite/standalone/test-num2integral.c
+++ b/test-suite/standalone/test-num2integral.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999,2000,2001,2003,2004, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1999,2000,2001,2003,2004, 2006, 2008 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -15,7 +15,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libguile.h"
+#include <libguile.h>
 
 #include <stdio.h>
 #include <assert.h>
diff --git a/test-suite/standalone/test-round.c b/test-suite/standalone/test-round.c
index a3928d26b..9725491c9 100644
--- a/test-suite/standalone/test-round.c
+++ b/test-suite/standalone/test-round.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2004, 2006, 2008 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -15,7 +15,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "config.h"
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #include <assert.h>
 #include <math.h>
@@ -25,7 +27,7 @@
 #include <fenv.h>
 #endif
 
-#include "libguile.h"
+#include <libguile.h>
 
 
 #define numberof(x)  (sizeof (x) / sizeof ((x)[0]))