From 12fa815248c4b98948afa36388418de0d0ead4a4 Mon Sep 17 00:00:00 2001 From: Bryan Jurish Date: Sun, 25 Jan 2009 22:23:14 +0000 Subject: + merged pstring+wchar changes from r10606:10638 into pdstring svn path=/trunk/externals/moocow/pdstring/; revision=10639 --- src/pdstring.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'src/pdstring.c') 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"), -- cgit v1.2.1