Skip to content

Commit

Permalink
Use system includes instead of local includes. This allows replacemen…
Browse files Browse the repository at this point in the history 
…t 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
  • Loading branch information
@PeterJohnson
PeterJohnson committed Mar 26, 2003
1 parent 1752e21 commit ddc08a6
Show file tree
Hide file tree
Showing 18 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion frontends/yasm/yasm-module.c
View file
Expand Up @@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#define YASM_LIB_INTERNAL
#include "libyasm.h"
#include <libyasm.h>
/*@unused@*/ RCSID("$IdPath$");

#include "ltdl.h"
Expand Down
2 changes: 1 addition & 1 deletion frontends/yasm/yasm-options.c
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion frontends/yasm/yasm.c
View file
Expand Up @@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#define YASM_LIB_INTERNAL
#include "libyasm.h"
#include <libyasm.h>
/*@unused@*/ RCSID("$IdPath$");

#ifndef WIN32
Expand Down
40 changes: 20 additions & 20 deletions libyasm.h
View file
Expand Up @@ -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
8 changes: 4 additions & 4 deletions libyasm/util.h
View file
Expand Up @@ -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)
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion modules/arch/x86/x86arch.c
View file
Expand Up @@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#define YASM_LIB_INTERNAL
#include "libyasm.h"
#include <libyasm.h>
/*@unused@*/ RCSID("$IdPath$");

#include "x86arch.h"
Expand Down
2 changes: 1 addition & 1 deletion modules/arch/x86/x86bc.c
View file
Expand Up @@ -26,7 +26,7 @@
*/
#define YASM_LIB_INTERNAL
#define YASM_BC_INTERNAL
#include "libyasm.h"
#include <libyasm.h>
/*@unused@*/ RCSID("$IdPath$");

#include "x86arch.h"
Expand Down
2 changes: 1 addition & 1 deletion modules/arch/x86/x86expr.c
View file
Expand Up @@ -26,7 +26,7 @@
*/
#define YASM_LIB_INTERNAL
#define YASM_EXPR_INTERNAL
#include "libyasm.h"
#include <libyasm.h>
/*@unused@*/ RCSID("$IdPath$");

#include "x86arch.h"
Expand Down
2 changes: 1 addition & 1 deletion modules/arch/x86/x86id.re
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion modules/dbgfmts/null/null-dbgfmt.c
View file
Expand Up @@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#define YASM_LIB_INTERNAL
#include "libyasm.h"
#include <libyasm.h>
/*@unused@*/ RCSID("$IdPath$");


Expand Down
2 changes: 1 addition & 1 deletion modules/objfmts/bin/bin-objfmt.c
View file
Expand Up @@ -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$");


Expand Down
2 changes: 1 addition & 1 deletion modules/objfmts/coff/coff-objfmt.c
View file
Expand Up @@ -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$");


Expand Down
2 changes: 1 addition & 1 deletion modules/objfmts/dbg/dbg-objfmt.c
View file
Expand Up @@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#define YASM_LIB_INTERNAL
#include "libyasm.h"
#include <libyasm.h>
/*@unused@*/ RCSID("$IdPath$");


Expand Down
2 changes: 1 addition & 1 deletion modules/optimizers/basic/basic-optimizer.c
View file
Expand Up @@ -26,7 +26,7 @@
*/
#define YASM_LIB_INTERNAL
#define YASM_BC_INTERNAL
#include "libyasm.h"
#include <libyasm.h>
/*@unused@*/ RCSID("$IdPath$");


Expand Down
2 changes: 1 addition & 1 deletion modules/parsers/nasm/nasm-bison.y
View file
Expand Up @@ -27,7 +27,7 @@
%{
#define YASM_LIB_INTERNAL
#define YASM_EXPR_INTERNAL
#include "libyasm.h"
#include <libyasm.h>
RCSID("$IdPath$");

#ifdef STDC_HEADERS
Expand Down
2 changes: 1 addition & 1 deletion modules/parsers/nasm/nasm-parser.c
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion modules/parsers/nasm/nasm-token.re
View file
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions util.h
View file
Expand Up @@ -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)
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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

0 comments on commit ddc08a6

Please sign in to comment.