diff options
| author | Robert Xu <rxu@linux-zdwj.site> | 2012-02-01 00:31:59 -0500 |
|---|---|---|
| committer | Robert Xu <rxu@linux-zdwj.site> | 2012-02-01 00:31:59 -0500 |
| commit | f599f39717d771b8b7a2aff006cda6c31e8b12da (patch) | |
| tree | f601e3c0303a193cda6f8c6f956619dda9673c70 /opensuse/core/tdebase/gcc44.diff | |
| parent | ead369ac94473139a2320a1c90cda64dd887b94a (diff) | |
| parent | 27c9e783c6283f8916ebee3a23c6d1ba909a5126 (diff) | |
| download | tde-packaging-f599f39717d771b8b7a2aff006cda6c31e8b12da.tar.gz tde-packaging-f599f39717d771b8b7a2aff006cda6c31e8b12da.zip | |
Merge branch 'suse'
Diffstat (limited to 'opensuse/core/tdebase/gcc44.diff')
| -rw-r--r-- | opensuse/core/tdebase/gcc44.diff | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/opensuse/core/tdebase/gcc44.diff b/opensuse/core/tdebase/gcc44.diff new file mode 100644 index 000000000..999b5f3ca --- /dev/null +++ b/opensuse/core/tdebase/gcc44.diff @@ -0,0 +1,20 @@ +--- kcontrol/kfontinst/kfontinst/Fontmap.cpp.sav 2006-01-19 18:00:49.000000000 +0100 ++++ kcontrol/kfontinst/kfontinst/Fontmap.cpp 2009-05-29 14:50:08.000000000 +0200 +@@ -44,7 +44,7 @@ + + using namespace std; + +-static char * findSpace(char *str) ++static const char * findSpace(const char *str) + { + while(str && *str!=' ' && *str!='\t') + str++; +@@ -65,7 +65,7 @@ static bool parseLine(const char *line, + char a[constMaxLen+1], + b[constFileMaxLen+1]; + +- char *slash1=strchr(line, '/'), ++ const char *slash1=strchr(line, '/'), + *space1=slash1 ? findSpace(slash1) : NULL, //strchr(slash1, ' ') : NULL, + *ob=slash1 ? strchr(slash1, '(') : NULL, + *cb=ob ? strchr(ob, ')') : NULL, |