Use system includes instead of local includes. This allows replacement of

key headers in certain situations (config.h when compiling with Visual C++ for
one), and is also more correct in general.

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

diff --git a/frontends/yasm/yasm-module.c b/frontends/yasm/yasm-module.c
index 432b23582f29d03a617f2c32ad834a15152c5349..cfe19d53003a829e018c6364ccc0c9cf358b39d2 100644 (file)
--- a/frontends/yasm/yasm-module.c
+++ b/frontends/yasm/yasm-module.c
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #define YASM_LIB_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 #include "ltdl.h"

diff --git a/frontends/yasm/yasm-options.c b/frontends/yasm/yasm-options.c
index fd8ba56019324996e12377de1aa9fe6c2d8c3a5c..5b309acb35767c2bc3f7f4ea8d1c64790ddaeefa 100644 (file)
--- a/frontends/yasm/yasm-options.c
+++ b/frontends/yasm/yasm-options.c
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #define YASM_LIB_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 #include "yasm-options.h"

diff --git a/frontends/yasm/yasm.c b/frontends/yasm/yasm.c
index 498fd49431c35c4487bd71df9b618b99b0a29aa7..1463a0660dd3d88a0b5afd71d8d47b484df8e2d3 100644 (file)
--- a/frontends/yasm/yasm.c
+++ b/frontends/yasm/yasm.c
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #define YASM_LIB_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 #ifndef WIN32

diff --git a/libyasm.h b/libyasm.h
index 9206f279b444a8cbf1763a9867cba78c13a076ce..74fa288de30f350dbca76bd5b163619f2b0c5e0a 100644 (file)
--- a/libyasm.h
+++ b/libyasm.h
@@ -45,35 +45,35 @@
  *                    (used when compiling the library itself)
  */
 
-#include "libyasm/util.h"
-#include "libyasm/linemgr.h"
+#include <libyasm/util.h>
+#include <libyasm/linemgr.h>
 
-#include "libyasm/errwarn.h"
-#include "libyasm/intnum.h"
-#include "libyasm/floatnum.h"
-#include "libyasm/expr.h"
-#include "libyasm/symrec.h"
+#include <libyasm/errwarn.h>
+#include <libyasm/intnum.h>
+#include <libyasm/floatnum.h>
+#include <libyasm/expr.h>
+#include <libyasm/symrec.h>
 
-#include "libyasm/bytecode.h"
-#include "libyasm/section.h"
+#include <libyasm/bytecode.h>
+#include <libyasm/section.h>
 
-#include "libyasm/arch.h"
-#include "libyasm/dbgfmt.h"
-#include "libyasm/objfmt.h"
-#include "libyasm/optimizer.h"
-#include "libyasm/parser.h"
-#include "libyasm/preproc.h"
+#include <libyasm/arch.h>
+#include <libyasm/dbgfmt.h>
+#include <libyasm/objfmt.h>
+#include <libyasm/optimizer.h>
+#include <libyasm/parser.h>
+#include <libyasm/preproc.h>
 
 #ifdef YASM_INTERNAL
 #ifdef YASM_BC_INTERNAL
-#include "libyasm/bc-int.h"
+#include <libyasm/bc-int.h>
 #endif
 #ifdef YASM_EXPR_INTERNAL
-#include "libyasm/expr-int.h"
+#include <libyasm/expr-int.h>
 #endif
-#include "libyasm/file.h"
-#include "libyasm/hamt.h"
-#include "libyasm/bitvect.h"
+#include <libyasm/file.h>
+#include <libyasm/hamt.h>
+#include <libyasm/bitvect.h>
 #endif
 
 #endif

diff --git a/libyasm/util.h b/libyasm/util.h
index 9cf5a0bc030e96afea9585e4da402da46019817f..ca3e26233344ce98f01f4f2338276bd3ff25a976 100644 (file)
--- a/libyasm/util.h
+++ b/libyasm/util.h
@@ -42,7 +42,7 @@
 # include <stdarg.h>
 
 #if defined(YASM_LIB_AC_INTERNAL) && defined(HAVE_CONFIG_H)
-# include "libyasm/config.h"
+# include <libyasm/config.h>
 #endif
 
 #if !defined(lint) && !defined(NDEBUG)
@@ -126,7 +126,7 @@ int yasm__strncasecmp(const char *s1, const char *s2, size_t n);
 
 #endif /*YASM_AUTOCONF_INTERNAL*/
 
-#include "libyasm/compat-queue.h"
+#include <libyasm/compat-queue.h>
 
 #if defined(YASM_AUTOCONF_INTERNAL) && defined(HAVE_SYS_CDEFS_H)
 # include <sys/cdefs.h>
@@ -195,8 +195,8 @@ extern void (*yasm_xfree) (/*@only@*/ /*@out@*/ /*@null@*/ void *p)
 
 #endif /*YASM_INTERNAL*/
 
-#include "libyasm/coretype.h"
+#include <libyasm/coretype.h>
 
-#include "libyasm/valparam.h"
+#include <libyasm/valparam.h>
 
 #endif

diff --git a/modules/arch/x86/x86arch.c b/modules/arch/x86/x86arch.c
index 4b44906f6f1d4fbdf21b45cf227cf21d93cd141d..138a8caf201b7df279f4703a94b52b6eff22a9b8 100644 (file)
--- a/modules/arch/x86/x86arch.c
+++ b/modules/arch/x86/x86arch.c
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #define YASM_LIB_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 #include "x86arch.h"

diff --git a/modules/arch/x86/x86bc.c b/modules/arch/x86/x86bc.c
index e812459cc3cf118c251c8c32e332bd8497b36199..ff78ba0e1a531bc88e686a061c88984b3bff1569 100644 (file)
--- a/modules/arch/x86/x86bc.c
+++ b/modules/arch/x86/x86bc.c
@@ -26,7 +26,7 @@
  */
 #define YASM_LIB_INTERNAL
 #define YASM_BC_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 #include "x86arch.h"

diff --git a/modules/arch/x86/x86expr.c b/modules/arch/x86/x86expr.c
index e218fd2264f78226531ae6a87c455367b677efaa..1cd0a275d4dc345222ba211de22333cc24ffa0b0 100644 (file)
--- a/modules/arch/x86/x86expr.c
+++ b/modules/arch/x86/x86expr.c
@@ -26,7 +26,7 @@
  */
 #define YASM_LIB_INTERNAL
 #define YASM_EXPR_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 #include "x86arch.h"

diff --git a/modules/arch/x86/x86id.re b/modules/arch/x86/x86id.re
index 8b5619e3c1b5cae71be904adfb095d894ceee724..d7a8bc74f33b3763053badbc1d684760632e41e8 100644 (file)
--- a/modules/arch/x86/x86id.re
+++ b/modules/arch/x86/x86id.re
@@ -27,7 +27,7 @@
 #define YASM_LIB_INTERNAL
 #define YASM_BC_INTERNAL
 #define YASM_EXPR_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 RCSID("$IdPath$");
 
 #include "modules/arch/x86/x86arch.h"

diff --git a/modules/dbgfmts/null/null-dbgfmt.c b/modules/dbgfmts/null/null-dbgfmt.c
index c3e875edc3798b55265a44885ba4a7c6cb8110b3..a3b6b9b365713d613d487b68320a6d8cdda3de72 100644 (file)
--- a/modules/dbgfmts/null/null-dbgfmt.c
+++ b/modules/dbgfmts/null/null-dbgfmt.c
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #define YASM_LIB_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 

diff --git a/modules/objfmts/bin/bin-objfmt.c b/modules/objfmts/bin/bin-objfmt.c
index 7afadbcb2cbbc44b13959e984be312acdc10bd1c..23d57b7f7d3af48de3a045616ecb49b9cbece0e2 100644 (file)
--- a/modules/objfmts/bin/bin-objfmt.c
+++ b/modules/objfmts/bin/bin-objfmt.c
@@ -27,7 +27,7 @@
 #define YASM_LIB_INTERNAL
 #define YASM_BC_INTERNAL
 #define YASM_EXPR_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 

diff --git a/modules/objfmts/coff/coff-objfmt.c b/modules/objfmts/coff/coff-objfmt.c
index 7cc5a511959c213ba54ab5eb6b78a3dc6f05e16f..2095a4d6b6e6517532b8c61c7333de475f2871e3 100644 (file)
--- a/modules/objfmts/coff/coff-objfmt.c
+++ b/modules/objfmts/coff/coff-objfmt.c
@@ -27,7 +27,7 @@
 #define YASM_LIB_INTERNAL
 #define YASM_BC_INTERNAL
 #define YASM_EXPR_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 

diff --git a/modules/objfmts/dbg/dbg-objfmt.c b/modules/objfmts/dbg/dbg-objfmt.c
index 06a587ee58db6b6bded60f9a1357c47579f19c36..dbdf5a32de69c40f496124df1bc157649dfedb8e 100644 (file)
--- a/modules/objfmts/dbg/dbg-objfmt.c
+++ b/modules/objfmts/dbg/dbg-objfmt.c
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #define YASM_LIB_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 

diff --git a/modules/optimizers/basic/basic-optimizer.c b/modules/optimizers/basic/basic-optimizer.c
index fea7f8fcf26076ddee37cf058e83a79f1d746599..ff47e175535cbae65578ecdb21a1e8f4de3087da 100644 (file)
--- a/modules/optimizers/basic/basic-optimizer.c
+++ b/modules/optimizers/basic/basic-optimizer.c
@@ -26,7 +26,7 @@
  */
 #define YASM_LIB_INTERNAL
 #define YASM_BC_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 

diff --git a/modules/parsers/nasm/nasm-bison.y b/modules/parsers/nasm/nasm-bison.y
index 3032d501b1d570b373349c7cbeb960c09ff525f7..0e0203de4cff16c5eeb10459badcec95355f64f4 100644 (file)
--- a/modules/parsers/nasm/nasm-bison.y
+++ b/modules/parsers/nasm/nasm-bison.y
@@ -27,7 +27,7 @@
 %{
 #define YASM_LIB_INTERNAL
 #define YASM_EXPR_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 RCSID("$IdPath$");
 
 #ifdef STDC_HEADERS

diff --git a/modules/parsers/nasm/nasm-parser.c b/modules/parsers/nasm/nasm-parser.c
index 5d48ae05eeffd0beceae2a24efecab2e6371bebd..a9796abe7b89ef913291c5b5628acac9c3295fb8 100644 (file)
--- a/modules/parsers/nasm/nasm-parser.c
+++ b/modules/parsers/nasm/nasm-parser.c
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #define YASM_LIB_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 /*@unused@*/ RCSID("$IdPath$");
 
 #include "nasm-parser.h"

diff --git a/modules/parsers/nasm/nasm-token.re b/modules/parsers/nasm/nasm-token.re
index af1b45e5495a4063fc4ee551ae59095bd0f17036..50b1bedc04a35c6ad188cb0c4ab8278cb7f7d42f 100644 (file)
--- a/modules/parsers/nasm/nasm-token.re
+++ b/modules/parsers/nasm/nasm-token.re
@@ -27,7 +27,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #define YASM_LIB_INTERNAL
-#include "libyasm.h"
+#include <libyasm.h>
 RCSID("$IdPath$");
 
 #include "modules/parsers/nasm/nasm-parser.h"

diff --git a/util.h b/util.h
index 9cf5a0bc030e96afea9585e4da402da46019817f..ca3e26233344ce98f01f4f2338276bd3ff25a976 100644 (file)
--- a/util.h
+++ b/util.h
@@ -42,7 +42,7 @@
 # include <stdarg.h>
 
 #if defined(YASM_LIB_AC_INTERNAL) && defined(HAVE_CONFIG_H)
-# include "libyasm/config.h"
+# include <libyasm/config.h>
 #endif
 
 #if !defined(lint) && !defined(NDEBUG)
@@ -126,7 +126,7 @@ int yasm__strncasecmp(const char *s1, const char *s2, size_t n);
 
 #endif /*YASM_AUTOCONF_INTERNAL*/
 
-#include "libyasm/compat-queue.h"
+#include <libyasm/compat-queue.h>
 
 #if defined(YASM_AUTOCONF_INTERNAL) && defined(HAVE_SYS_CDEFS_H)
 # include <sys/cdefs.h>
@@ -195,8 +195,8 @@ extern void (*yasm_xfree) (/*@only@*/ /*@out@*/ /*@null@*/ void *p)
 
 #endif /*YASM_INTERNAL*/
 
-#include "libyasm/coretype.h"
+#include <libyasm/coretype.h>
 
-#include "libyasm/valparam.h"
+#include <libyasm/valparam.h>
 
 #endif