* merged from dpkg-log

[apt.git] / apt-pkg / contrib / strutl.h

diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 6ec2b78119ece7a31a8085f25cfafc7a11eae845..53146ced7a9e6c71d293e01f851aa51ca703390c 100644 (file)
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -16,12 +16,11 @@
 #ifndef STRUTL_H
 #define STRUTL_H
 
 #ifndef STRUTL_H
 #define STRUTL_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/strutl.h"
-#endif 
+

 
 #include <stdlib.h>
 #include <string>
 
 #include <stdlib.h>
 #include <string>

+#include <cstring>

 #include <vector>
 #include <iostream>
 #include <time.h>
 #include <vector>
 #include <iostream>
 #include <time.h>


@@ -38,7 +37,8 @@ using std::ostream;
 #define APT_FORMAT2
 #define APT_FORMAT3
 #endif    
 #define APT_FORMAT2
 #define APT_FORMAT3
 #endif    

-    
+
+bool UTF8ToCodeset(const char *codeset, const string &orig, string *dest);

 char *_strstrip(char *String);
 char *_strtabexpand(char *String,size_t Len);
 bool ParseQuoteWord(const char *&String,string &Res);
 char *_strstrip(char *String);
 char *_strtabexpand(char *String,size_t Len);
 bool ParseQuoteWord(const char *&String,string &Res);