diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2007-06-09 00:19:51 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2007-06-09 00:19:51 +0200 |
| commit | 408a4726131e9db26ff868623a5d216a26c45a50 (patch) | |
| tree | a8b470ee8fd8d22e74e1245edb2b36400b9226dd /apt-pkg/contrib/strutl.h | |
| parent | 1979e742ad5e2a0b6e547fbe3f4c4066b5a9bd2e (diff) | |
| parent | 484dbb814fd2b787b2206ffe9504798dfd73ae6c (diff) | |
* huge merge to bring the apt debian-sid and ubuntu branches as close
as possible to apt--mvo again
Diffstat (limited to 'apt-pkg/contrib/strutl.h')
| -rw-r--r-- | apt-pkg/contrib/strutl.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index 6ec2b7811..ae1244ecd 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -16,9 +16,7 @@ #ifndef STRUTL_H #define STRUTL_H -#ifdef __GNUG__ -#pragma interface "apt-pkg/strutl.h" -#endif + #include <stdlib.h> #include <string> @@ -38,7 +36,8 @@ using std::ostream; #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); |