[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Changes to m4/m4/m4private.h,v
From: |
Eric Blake |
Subject: |
Changes to m4/m4/m4private.h,v |
Date: |
Thu, 06 Sep 2007 22:58:28 +0000 |
CVSROOT: /sources/m4
Module name: m4
Changes by: Eric Blake <ericb> 07/09/06 22:58:27
Index: m4/m4private.h
===================================================================
RCS file: /sources/m4/m4/m4/m4private.h,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- m4/m4private.h 7 Aug 2007 03:15:26 -0000 1.82
+++ m4/m4private.h 6 Sep 2007 22:58:26 -0000 1.83
@@ -23,6 +23,7 @@
#define M4PRIVATE_H 1
#include <m4/m4module.h>
+#include <ltdl.h>
#include "cloexec.h"
@@ -143,12 +144,22 @@
#define INIT_SYMBOL "m4_init_module"
#define FINISH_SYMBOL "m4_finish_module"
+struct m4_module
+{
+ lt_dlhandle handle; /* ltdl module information. */
+ /* TODO: add struct members, such as copy of builtins (so that we
+ can store additional information about builtins, and so that the
+ list isn't changed by the module behind our backs once we have
+ initialized it) or cached pointers (to reduce the number of calls
+ needed to lt_dlsym). */
+};
+
extern void m4__module_init (m4 *context);
-extern lt_dlhandle m4__module_open (m4 *context, const char *name,
+extern m4_module * m4__module_open (m4 *context, const char *name,
m4_obstack *obs);
extern void m4__module_exit (m4 *context);
-extern lt_dlhandle m4__module_next (lt_dlhandle);
-extern lt_dlhandle m4__module_find (const char *name);
+extern m4_module * m4__module_next (m4_module *);
+extern m4_module * m4__module_find (const char *name);
@@ -162,8 +173,8 @@
struct m4_symbol_value {
m4_symbol_value * next;
- lt_dlhandle handle;
- int flags;
+ m4_module * handle;
+ unsigned int flags;
m4_hash * arg_signature;
unsigned int min_args;
@@ -252,7 +263,8 @@
#define SYMBOL_ARG_REST_BIT (1 << 0)
#define SYMBOL_ARG_KEY_BIT (1 << 1)
-extern void m4__symtab_remove_module_references (m4_symbol_table*,
lt_dlhandle);
+extern void m4__symtab_remove_module_references (m4_symbol_table*,
+ m4_module *);
- Changes to m4/m4/m4private.h,v,
Eric Blake <=