]>
Commit | Line | Data |
---|---|---|
8fce0c80 | 1 | --- nautilus-1.0.6/components/mozilla/nautilus-mozilla-embed-extensions.cpp~ Mon Oct 15 19:31:46 2001 |
2 | +++ nautilus-1.0.6/components/mozilla/nautilus-mozilla-embed-extensions.cpp Mon Dec 3 17:44:21 2001 | |
3 | @@ -47,12 +47,17 @@ | |
4 | ||
5 | #include <vector> | |
6 | ||
7 | +#if __GNUC__ < 3 | |
8 | /* We can't include <string> because of a bug in g++, which gets confused | |
9 | * by the "string" directory in the mozilla include directory. So we do the | |
10 | * following as a workaround. | |
11 | */ | |
12 | #include <std/bastring.h> | |
13 | typedef basic_string<char> string; | |
14 | +#else | |
15 | +#include <string> | |
16 | +using namespace std; | |
17 | +#endif | |
18 | ||
19 | struct Encoding | |
20 | { |