From cfc6bf0dedf4aa501937be4406ed50e6e4649a97 Mon Sep 17 00:00:00 2001
From: Peter Johnson <peter@tortall.net>
Date: Mon, 5 May 2003 03:42:12 +0000
Subject: Clean up and simplify libyasm.h options and symbol visibility: - Move
 config.h and util.h from libyasm (and installed libyasm) to top level. - Move
 yasm_* functions from util.h to coretype.h. - Remove a number of
 autoconf-related YASM_*_INTERNAL options from libyasm.h. - Rename
 YASM_INTERNAL to YASM_LIB_INTERNAL; it now actually means what the   comment
 describes: enables definitions that violate the yasm_* namespace.

While we're at it, no longer define YASM_LIB_INTERNAL from yasm frontend, so
it's closer to what a real typical libyasm-using application would look like.

svn path=/trunk/yasm/; revision=944
---
 libyasm.h | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'libyasm.h')

diff --git a/libyasm.h b/libyasm.h
index 6e70e2cd..ff86421b 100644
--- a/libyasm.h
+++ b/libyasm.h
@@ -1,4 +1,4 @@
-/* $IdPath$
+/* $IdPath: yasm/libyasm.h,v 1.3 2003/03/30 21:27:25 peter Exp $
  * Libyasm interface primary header file.
  *
  *  Copyright (C) 2003  Peter Johnson
@@ -27,25 +27,25 @@
 #ifndef YASM_LIB_H
 #define YASM_LIB_H
 
-/* Define YASM_INTERNAL to include many internal function and variable defs.
- * This includes compat-queue.h, bitvect.h, hamt.h, and util.h, which violate
- * the yasm_* namespace (see individual files for details)!
+/* Define YASM_LIB_INTERNAL to include many internal function and variable
+ * definitions that violate the yasm_* namespace.  This includes
+ * compat-queue.h, bitvect.h, and hamt.h.
  *
- * Additional parts may be included via YASM_*_INTERNAL inclusion flags:
+ * Additional parts may be included via:
  * YASM_BC_INTERNAL: reveal bytecode internal structures via bc-int.h inclusion
  * YASM_EXPR_INTERNAL: reveal expr internal structures via expr-int.h inclusion
- * YASM_AUTOCONF_INTERNAL: include parts of util.h that depend on certain
- *                         autoconfig settings.. see util.h for more details
- * YASM_LIB_AC_INTERNAL: include libyasm/config.h if HAVE_CONFIG_H is defined
- * YASM_GETTEXT_INTERNAL: define typical gettext _() and N_().  Requires
- *                        YASM_AUTOCONF_INTERNAL define.
- *
- * YASM_LIB_INTERNAL: defines YASM_INTERNAL, YASM_AUTOCONF_INTERNAL,
- *                    YASM_LIB_AC_INTERNAL, and YASM_GETTEXT_INTERNAL
- *                    (used when compiling the library itself)
  */
 
-#include <libyasm/util.h>
+#include <stdio.h>
+#include <stdarg.h>
+
+#ifdef YASM_LIB_INTERNAL
+# include <libyasm/compat-queue.h>
+#endif
+
+#include <libyasm/coretype.h>
+#include <libyasm/valparam.h>
+
 #include <libyasm/linemgr.h>
 
 #include <libyasm/errwarn.h>
@@ -66,7 +66,7 @@
 
 #include <libyasm/file.h>
 
-#ifdef YASM_INTERNAL
+#ifdef YASM_LIB_INTERNAL
 #ifdef YASM_BC_INTERNAL
 #include <libyasm/bc-int.h>
 #endif
-- 
cgit v1.2.1