summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpixel <pixel>2006-02-02 11:01:13 +0000
committerpixel <pixel>2006-02-02 11:01:13 +0000
commit95c163e9d110a66cf9a8a5f632a784463a6512af (patch)
treed9dc3303fc68fdd0381dae604553382709444b6f
parent63c5e5338d734c07910b351ea83ae9866f462ea8 (diff)
Fixing old Dalos, and fixing Linux compilation.
-rw-r--r--lib/String.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/String.cc b/lib/String.cc
index 20cade9..969d335 100644
--- a/lib/String.cc
+++ b/lib/String.cc
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/* $Id: String.cc,v 1.41 2006-01-31 17:02:39 pixel Exp $ */
+/* $Id: String.cc,v 1.42 2006-02-02 11:01:13 pixel Exp $ */
#include <stdio.h>
#include <string.h>
@@ -562,7 +562,11 @@ String String::trim() const {
String & String::iconv(const String & from, const String & to) {
iconv_t cd;
+#ifdef __linux__
+ char * inbuf;
+#else
const char * inbuf;
+#endif
char * outbuf;
size_t inleft, outleft;