1 files changed, 16 insertions, 11 deletions

diff --git a/libguile/srcprop.h b/libguile/srcprop.h
index 93c60ac26..b53eb13b7 100644
--- a/libguile/srcprop.h
+++ b/libguile/srcprop.h
@@ -80,32 +80,37 @@ do { \
 
 extern scm_bits_t scm_tc16_srcprops;
 
-typedef struct scm_srcprops
+typedef struct scm_srcprops_t
 {
   unsigned long pos;
   SCM fname;
   SCM copy;
   SCM plist;
-} scm_srcprops;
+} scm_srcprops_t;
 
 #define SRCPROPS_CHUNKSIZE 2047 /* Number of srcprops per chunk */
-typedef struct scm_srcprops_chunk
+typedef struct scm_srcprops_chunk_t
 {
-  struct scm_srcprops_chunk *next;
-  scm_srcprops srcprops[1];
-} scm_srcprops_chunk;
+  struct scm_srcprops_chunk_t *next;
+  scm_srcprops_t srcprops[1];
+} scm_srcprops_chunk_t;
+
+#if (SCM_DEBUG_DEPRECATED == 0)
+# define scm_srcprops scm_srcprops_t
+# define scm_srcprops_chunk scm_srcprops_chunk_t
+#endif
 
 #define SCM_SOURCE_PROPERTY_FLAG_BREAK (1L << 16)
 
 #define SRCPROPSP(p) (SCM_TYP16_PREDICATE (scm_tc16_srcprops, p))
 #define SRCPROPBRK(p) \
   (SCM_BOOL (SCM_CELL_WORD_0 (p) & SCM_SOURCE_PROPERTY_FLAG_BREAK))
-#define SRCPROPPOS(p) ((scm_srcprops *) SCM_CELL_WORD_1 (p))->pos
+#define SRCPROPPOS(p) ((scm_srcprops_t *) SCM_CELL_WORD_1 (p))->pos
 #define SRCPROPLINE(p) (SRCPROPPOS(p) >> 12)
 #define SRCPROPCOL(p) (SRCPROPPOS(p) & 0x0fffL)
-#define SRCPROPFNAME(p) ((scm_srcprops *) SCM_CELL_WORD_1 (p))->fname
-#define SRCPROPCOPY(p) ((scm_srcprops *) SCM_CELL_WORD_1 (p))->copy
-#define SRCPROPPLIST(p) ((scm_srcprops *) SCM_CELL_WORD_1 (p))->plist
+#define SRCPROPFNAME(p) ((scm_srcprops_t *) SCM_CELL_WORD_1 (p))->fname
+#define SRCPROPCOPY(p) ((scm_srcprops_t *) SCM_CELL_WORD_1 (p))->copy
+#define SRCPROPPLIST(p) ((scm_srcprops_t *) SCM_CELL_WORD_1 (p))->plist
 #define SETSRCPROPBRK(p) \
   (SCM_SET_CELL_WORD_0 ((p), SCM_CELL_WORD_0 (p) \
                              | SCM_SOURCE_PROPERTY_FLAG_BREAK))
@@ -133,7 +138,7 @@ extern SCM scm_sym_breakpoint;
 
 
 extern SCM scm_srcprops_to_plist (SCM obj);
-extern SCM scm_make_srcprops (int line, int col, SCM fname, SCM copy, SCM plist);
+extern SCM scm_make_srcprops (long line, int col, SCM fname, SCM copy, SCM plist);
 extern SCM scm_source_property (SCM obj, SCM key);
 extern SCM scm_set_source_property_x (SCM obj, SCM key, SCM datum);
 extern SCM scm_source_properties (SCM obj);