From 3874f848c162c1a411d7abffca9b50428c39a47e Mon Sep 17 00:00:00 2001 From: kojima Date: Sat, 6 Jan 2001 01:52:27 +0000 Subject: [PATCH] fixed compilation probs with SGI cc --- ChangeLog | 4 ++++ WINGs/Extras/test.c | 6 +++--- WINGs/wtext.c | 6 +----- src/plugin.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index fe75c6e7..bec74b34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Changes since version 0.63.0: +............................. +- fixed compile prob with SGI compiler + Changes since version 0.62.1: ............................. - added blackbox style igradient (interwoven) diff --git a/WINGs/Extras/test.c b/WINGs/Extras/test.c index b62dadb3..fedba874 100644 --- a/WINGs/Extras/test.c +++ b/WINGs/Extras/test.c @@ -34,10 +34,10 @@ void *valueForCell(WMTableViewDelegate *self, WMTableColumn *column, int row) col2[i] = 0; } } - if (WMGetTableColumnId(column) == 1) + if ((int)WMGetTableColumnId(column) == 1) return col1[row]; else - return col2[row]; + return (void*)col2[row]; } @@ -47,7 +47,7 @@ void setValueForCell(WMTableViewDelegate *self, WMTableColumn *column, int row, if (WMGetTableColumnId(column) == 1) col1[row] = data; else - col2[row] = data; + col2[row] = (int)data; } diff --git a/WINGs/wtext.c b/WINGs/wtext.c index 2f144f22..60f6af8f 100644 --- a/WINGs/wtext.c +++ b/WINGs/wtext.c @@ -1807,11 +1807,7 @@ W_ViewDelegate _TextViewDelegate = }; /* nice, divisble-by-16 blocks */ -static inline unsigned short -reqBlockSize(unsigned short requested) -{ - return requested + 16 - (requested%16); -} +#define reqBlockSize(requested) (requested + 16 - (requested%16)) static void diff --git a/src/plugin.h b/src/plugin.h index 94e803d3..c5d8a655 100644 --- a/src/plugin.h +++ b/src/plugin.h @@ -44,7 +44,7 @@ typedef struct _WPluginData { void **array; } WPluginData; -typedef void _DL_AnyProc(proplist_t); +typedef void (*_DL_AnyProc)(proplist_t); /* first 3 must == WS_FOCUSED WS_UNFOCUSED WS_PFOCUSED -- ]d */ #ifdef DRAWSTRING_PLUGIN