summaryrefslogtreecommitdiff
path: root/libguile/debug.h
diff options
context:
space:
mode:
Diffstat (limited to 'libguile/debug.h')
-rw-r--r--libguile/debug.h27
1 files changed, 16 insertions, 11 deletions
diff --git a/libguile/debug.h b/libguile/debug.h
index ba143ace6..2ee0e777c 100644
--- a/libguile/debug.h
+++ b/libguile/debug.h
@@ -69,7 +69,7 @@
/* scm_debug_opts is defined in eval.c.
*/
-extern scm_option scm_debug_opts[];
+extern scm_option_t scm_debug_opts[];
#define SCM_CHEAPTRAPS_P scm_debug_opts[0].val
#define SCM_BREAKPOINTS_P scm_debug_opts[1].val
@@ -108,25 +108,30 @@ do {\
/* {Evaluator}
*/
-typedef union scm_debug_info
+typedef union scm_debug_info_t
{
struct { SCM exp, env; } e;
struct { SCM proc, args; } a;
SCM id;
-} scm_debug_info;
+} scm_debug_info_t;
-extern int scm_debug_eframe_size;
+extern scm_bits_t scm_debug_eframe_size;
-typedef struct scm_debug_frame
+typedef struct scm_debug_frame_t
{
- struct scm_debug_frame *prev;
+ struct scm_debug_frame_t *prev;
long status;
- scm_debug_info *vect;
- scm_debug_info *info;
-} scm_debug_frame;
+ scm_debug_info_t *vect;
+ scm_debug_info_t *info;
+} scm_debug_frame_t;
+
+#if (SCM_DEBUG_DEPRECATED == 0)
+# define scm_debug_info scm_debug_info_t
+# define scm_debug_frame scm_debug_frame_t
+#endif
#ifndef USE_THREADS
-extern scm_debug_frame *scm_last_debug_frame;
+extern scm_debug_frame_t *scm_last_debug_frame;
#endif
#define SCM_EVALFRAME (0L << 11)
@@ -201,7 +206,7 @@ extern SCM scm_with_traps (SCM thunk);
extern SCM scm_evaluator_traps (SCM setting);
extern SCM scm_debug_options (SCM setting);
extern SCM scm_unmemoize (SCM memoized);
-extern SCM scm_make_debugobj (scm_debug_frame* debug);
+extern SCM scm_make_debugobj (scm_debug_frame_t *debug);
extern void scm_init_debug (void);
#ifdef GUILE_DEBUG