aboutsummaryrefslogtreecommitdiff
path: root/src/pdstring.c
diff options
context:
space:
mode:
authorBryan Jurish <mukau@users.sourceforge.net>2009-01-25 22:23:14 +0000
committerBryan Jurish <mukau@users.sourceforge.net>2009-01-25 22:23:14 +0000
commit12fa815248c4b98948afa36388418de0d0ead4a4 (patch)
treeb64a3b3412097545fc7f37e753acef6a12177a3c /src/pdstring.c
parent76117ae3455718e7614caaa4f74dbd6f5ab98e72 (diff)
+ merged pstring+wchar changes from r10606:10638 into pdstring
svn path=/trunk/externals/moocow/pdstring/; revision=10639
Diffstat (limited to 'src/pdstring.c')
-rw-r--r--src/pdstring.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/pdstring.c b/src/pdstring.c
index 44add2d..907d16d 100644
--- a/src/pdstring.c
+++ b/src/pdstring.c
@@ -55,13 +55,10 @@ typedef struct _pdstring
* External declarations
*=====================================================================*/
#ifndef PDSTRING_OBJECT_EXTERNALS
-/*
-extern void any2string_setup_guts(void);
-extern void string2any_setup_guts(void);
-*/
-#include "any2string.c"
-#include "string2any.c"
-
+# include "any2bytes.c"
+# include "bytes2any.c"
+# include "bytes2wchars.c"
+# include "wchars2bytes.c"
#endif
/*--------------------------------------------------------------------
@@ -91,8 +88,10 @@ void pdstring_setup(void)
pdstring_help(NULL);
#ifndef PDSTRING_OBJECT_EXTERNALS
- any2string_setup_guts();
- string2any_setup_guts();
+ any2bytes_setup_guts();
+ bytes2any_setup_guts();
+ bytes2wchars_setup_guts();
+ wchars2bytes_setup_guts();
#endif
pdstring_class = class_new(gensym("pdstring"),