48 lines
1.2 KiB
Diff
48 lines
1.2 KiB
Diff
diff -up kdelibs-4.2.0/kdeui/util/fixx11h.h.orig kdelibs-4.2.0/kdeui/util/fixx11h.h
|
|
--- kdelibs-4.2.0/kdeui/util/fixx11h.h.orig 2008-05-21 13:08:51.000000000 +0200
|
|
+++ kdelibs-4.2.0/kdeui/util/fixx11h.h 2009-02-26 12:14:01.000000000 +0100
|
|
@@ -251,13 +251,21 @@ const int FontChange = XFontChange;
|
|
#ifndef FIXX11H_index
|
|
#define FIXX11H_index
|
|
inline
|
|
+#if defined __cplusplus && __GNUC_PREREQ (4, 4)
|
|
+char* Xindex( char* s, int c )
|
|
+#else
|
|
char* Xindex( const char* s, int c )
|
|
+#endif
|
|
{
|
|
return index( s, c );
|
|
}
|
|
#undef index
|
|
inline
|
|
+#if defined __cplusplus && __GNUC_PREREQ (4, 4)
|
|
+char* index( char* s, int c )
|
|
+#else
|
|
char* index( const char* s, int c )
|
|
+#endif
|
|
{
|
|
return Xindex( s, c );
|
|
}
|
|
@@ -271,13 +279,21 @@ char* index( const char* s, int c )
|
|
#ifndef FIXX11H_rindex
|
|
#define FIXX11H_rindex
|
|
inline
|
|
+# if defined __cplusplus && __GNUC_PREREQ (4, 4)
|
|
+char* Xrindex( char* s, int c )
|
|
+#else
|
|
char* Xrindex( const char* s, int c )
|
|
+#endif
|
|
{
|
|
return rindex( s, c );
|
|
}
|
|
#undef rindex
|
|
inline
|
|
+# if defined __cplusplus && __GNUC_PREREQ (4, 4)
|
|
+char* rindex( char* s, int c )
|
|
+#else
|
|
char* rindex( const char* s, int c )
|
|
+#endif
|
|
{
|
|
return Xrindex( s, c );
|
|
}
|