From 9f88f551fc786dba0cef999a8eff5272febb5070 Mon Sep 17 00:00:00 2001 From: cconnell Date: Fri, 25 Jan 2008 20:53:27 +0000 Subject: [PATCH] Compile on OpenSolaris BUG:156626 git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdenetwork@766431 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kopete/libkopete/avdevice/videodevice.h | 3 +++ kopete/protocols/oscar/liboscar/utils/rtf.cc | 4 ++-- kopete/protocols/oscar/liboscar/utils/rtf.ll | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/kopete/libkopete/avdevice/videodevice.h b/kopete/libkopete/avdevice/videodevice.h index 1db1a3f13..ac21e33f2 100644 --- a/kopete/libkopete/avdevice/videodevice.h +++ b/kopete/libkopete/avdevice/videodevice.h @@ -41,6 +41,9 @@ #ifndef __s64 //required by videodev.h #define __s64 signed long long #endif // __s64 +#ifndef __s32 //required by videodev.h +#define __s32 signed long +#endif // __s32 #ifndef pgoff_t diff --git a/kopete/protocols/oscar/liboscar/utils/rtf.cc b/kopete/protocols/oscar/liboscar/utils/rtf.cc index 384b4e6b0..b3ed2d808 100644 --- a/kopete/protocols/oscar/liboscar/utils/rtf.cc +++ b/kopete/protocols/oscar/liboscar/utils/rtf.cc @@ -2194,7 +2194,7 @@ const unsigned RED = 2; const unsigned GREEN = 3; const unsigned BLUE = 4; const unsigned CF = 5; -const unsigned FS = 6; +const unsigned FS_ = 6; // underscored because of conflict with definition on OpenSolaris const unsigned HIGHLIGHT = 7; const unsigned PARD = 8; const unsigned PAR = 9; @@ -2358,7 +2358,7 @@ QString RTF2HTML::Parse(const char *rtf, const char *_encoding) case CF: cur_level.setFontColor(cmd_value); break; - case FS: + case FS_: cur_level.setFontSizeHalfPoints(cmd_value); break; case HIGHLIGHT: diff --git a/kopete/protocols/oscar/liboscar/utils/rtf.ll b/kopete/protocols/oscar/liboscar/utils/rtf.ll index 37318d92a..fea6dcc23 100644 --- a/kopete/protocols/oscar/liboscar/utils/rtf.ll +++ b/kopete/protocols/oscar/liboscar/utils/rtf.ll @@ -631,7 +631,7 @@ const unsigned RED = 2; const unsigned GREEN = 3; const unsigned BLUE = 4; const unsigned CF = 5; -const unsigned FS = 6; +const unsigned FS_ = 6; const unsigned HIGHLIGHT = 7; const unsigned PARD = 8; const unsigned PAR = 9; @@ -795,7 +795,7 @@ QString RTF2HTML::Parse(const char *rtf, const char *_encoding) case CF: cur_level.setFontColor(cmd_value); break; - case FS: + case FS_: cur_level.setFontSizeHalfPoints(cmd_value); break; case HIGHLIGHT: -- 2.11.4.GIT