Skip to content

extras/panel/scim_panel_gtk.cpp: fix build with clang19 #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
clan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

extras/panel/scim_panel_gtk.cpp: fix build with clang19 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7d38ad
extras/panel/scim_panel_gtk.cpp: fix build with clang19
clan Feb 25, 2025
071bf29
i18nMethod: fix build w/ gcc 15
clan May 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions extras/panel/scim_panel_gtk.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2560,10 +2560,10 @@ create_pango_attrlist (const String &mbs,
guint wlen = g_utf8_strlen (mbs.c_str (), mbs.length ());

#if GTK_CHECK_VERSION(3, 0, 0)
guint16 _normal_bg_rgb[] = { 65536*_normal_bg.red, 65536*_normal_bg.green, 65536*_normal_bg.blue };
guint16 _active_bg_rgb[] = { 65536*_active_bg.red, 65536*_active_bg.green, 65536*_active_bg.blue };
guint16 _normal_text_rgb[] = { 65536*_normal_text.red, 65536*_normal_text.green, 65536*_normal_text.blue };
guint16 _active_text_rgb[] = { 65536*_active_text.red, 65536*_active_text.green, 65536*_active_text.blue };
guint16 _normal_bg_rgb[] = { (guint16)(65536*_normal_bg.red), (guint16)(65536*_normal_bg.green), (guint16)(65536*_normal_bg.blue) };
guint16 _active_bg_rgb[] = { (guint16)(65536*_active_bg.red), (guint16)(65536*_active_bg.green), (guint16)(65536*_active_bg.blue) };
guint16 _normal_text_rgb[] = { (guint16)(65536*_normal_text.red), (guint16)(65536*_normal_text.green), (guint16)(65536*_normal_text.blue) };
guint16 _active_text_rgb[] = { (guint16)(65536*_active_text.red), (guint16)(65536*_active_text.green), (guint16)(65536*_active_text.blue) };
#else
guint16 _normal_bg_rgb[] = { _normal_bg.red, _normal_bg.green, _normal_bg.blue };
guint16 _active_bg_rgb[] = { _active_bg.red, _active_bg.green, _active_bg.blue };
Expand Down
14 changes: 9 additions & 5 deletions modules/FrontEnd/IMdkit/Xi18n.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,18 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define I18N_SET 1
#define I18N_GET 2

typedef struct
typedef struct _Xi18nCore *Xi18n;
struct _TransportSW;
typedef struct _TransportSW TransportSW;

typedef Bool (*CheckAddrFunc)(Xi18n i18n_core, TransportSW *transSW, char *address);

struct _TransportSW
{
char *transportname;
int namelen;
Bool (*checkAddr) ();
} TransportSW;
CheckAddrFunc checkAddr;
};

typedef struct _XIMPending
{
Expand Down Expand Up @@ -168,8 +174,6 @@ typedef struct _Xi18nClient
struct _Xi18nClient *next;
} Xi18nClient;

typedef struct _Xi18nCore *Xi18n;

/*
* Callback Struct for XIM Protocol
*/
Expand Down
2 changes: 1 addition & 1 deletion modules/FrontEnd/IMdkit/i18nMethod.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ TransportSW _TransR[] =
#ifdef DNETCONN
{"decnet", 6, _Xi18nCheckTransAddress},
#endif
{(char *) NULL, 0, (Bool (*) ()) NULL}
{(char *) NULL, 0, (CheckAddrFunc) NULL}
};

static Bool GetInputStyles (Xi18n i18n_core, XIMStyles **p_style)
Expand Down