aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorN.N. <matju@users.sourceforge.net>2009-04-26 17:15:18 +0000
committerN.N. <matju@users.sourceforge.net>2009-04-26 17:15:18 +0000
commit5d76dd5632d800615c795c28bcc5090e2a50315b (patch)
tree392cd7f87641600dad6636a0cdc788d338f54b21
parent696e04ba7d19fa1d370a8f4a6fc71f49345c3553 (diff)
moved some asprintf stuff that really should go in the .c instead of .h
svn path=/trunk/; revision=11153
-rw-r--r--desiredata/src/desire.h19
-rw-r--r--desiredata/src/kernel.c22
2 files changed, 21 insertions, 20 deletions
diff --git a/desiredata/src/desire.h b/desiredata/src/desire.h
index eb87fef4..26645061 100644
--- a/desiredata/src/desire.h
+++ b/desiredata/src/desire.h
@@ -55,25 +55,6 @@ extern "C" {
#ifndef HAVE_VASPRINTF
#define HAVE_VASPRINTF
-#include <stdio.h>
-#include <errno.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stdlib.h>
-
-#ifndef VA_COPY
-# ifdef HAVE_VA_COPY
-# define VA_COPY(dest, src) va_copy(dest, src)
-# else
-# ifdef HAVE___VA_COPY
-# define VA_COPY(dest, src) __va_copy(dest, src)
-# else
-# define VA_COPY(dest, src) (dest) = (src)
-# endif
-# endif
-#endif
-
-#define INIT_SZ 128
extern int vasprintf(char **str, const char *fmt, va_list ap);
#endif
diff --git a/desiredata/src/kernel.c b/desiredata/src/kernel.c
index 03ef0d59..f7ccc246 100644
--- a/desiredata/src/kernel.c
+++ b/desiredata/src/kernel.c
@@ -7,7 +7,7 @@
/* IOhannes :
* changed the canvas_restore in "g_canvas.c", so that it might accept $args as well (like "pd $0_test")
* so you can make multiple & distinguishable templates
- * 1511:forum::für::umläute:2001
+ * 1511:forum::f�r::uml�ute:2001
* change marked with IOhannes
*/
@@ -2362,6 +2362,26 @@ int asprintf(char **str, const char *fmt, ...)
}
#endif /* HAVE_ASPRINTF */
#ifndef HAVE_VASPRINTF
+#include <stdio.h>
+#include <errno.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stdlib.h>
+
+#ifndef VA_COPY
+# ifdef HAVE_VA_COPY
+# define VA_COPY(dest, src) va_copy(dest, src)
+# else
+# ifdef HAVE___VA_COPY
+# define VA_COPY(dest, src) __va_copy(dest, src)
+# else
+# define VA_COPY(dest, src) (dest) = (src)
+# endif
+# endif
+#endif
+
+#define INIT_SZ 128
+
int vasprintf(char **str, const char *fmt, va_list ap)
{
int ret = -1;