1
0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-22 14:08:06 +01:00

Applied some patches from Balaton Zoltan <balaton@eik.bme.hu>

- small fix for compilation in a different directory than the source
- fixed some warnings on 64bit platforms
This commit is contained in:
dan
2006-01-22 15:53:44 +00:00
parent c0317ddae5
commit 054f954390
4 changed files with 7 additions and 4 deletions

View File

@@ -8,6 +8,9 @@ Changes since version 0.92.0:
- fixed gcc-4 compilation issues (Vladimir Nadvornik <nadvornik@suse.cz>) - fixed gcc-4 compilation issues (Vladimir Nadvornik <nadvornik@suse.cz>)
- fixed amd64 compilation issues (Vladimir Nadvornik <nadvornik@suse.cz>) - fixed amd64 compilation issues (Vladimir Nadvornik <nadvornik@suse.cz>)
- eliminated gcc-4 compilation warnings - eliminated gcc-4 compilation warnings
- small fix for compilation in a different directory than the source
(Balaton Zoltan <balaton@eik.bme.hu>)
- fixed some warnings on 64bit platforms (Balaton Zoltan <balaton@eik.bme.hu>)
Changes since version 0.91.0: Changes since version 0.91.0:

View File

@@ -188,7 +188,7 @@ WMSetBrowserMaxVisibleColumns(WMBrowser *bPtr, int columns)
int curMaxVisibleColumns; int curMaxVisibleColumns;
int newFirstVisibleColumn = 0; int newFirstVisibleColumn = 0;
assert ((int) bPtr); assert (bPtr != NULL);
columns = (columns < MIN_VISIBLE_COLUMNS) ? MIN_VISIBLE_COLUMNS : columns; columns = (columns < MIN_VISIBLE_COLUMNS) ? MIN_VISIBLE_COLUMNS : columns;
columns = (columns > MAX_VISIBLE_COLUMNS) ? MAX_VISIBLE_COLUMNS : columns; columns = (columns > MAX_VISIBLE_COLUMNS) ? MAX_VISIBLE_COLUMNS : columns;
@@ -324,7 +324,7 @@ removeColumn(WMBrowser *bPtr, int column)
WMList **clist; WMList **clist;
char **tlist; char **tlist;
assert ((int) bPtr); assert (bPtr != NULL);
column = (column < 0) ? 0 : column; column = (column < 0) ? 0 : column;
if (column >= bPtr->columnCount) { if (column >= bPtr->columnCount) {

View File

@@ -1969,7 +1969,7 @@ deleteTextInteractively(Text *tPtr, KeySym ksym)
} else if(tb->used == 0) { } else if(tb->used == 0) {
tb->blank = 1; tb->blank = 1;
} else if(tb->graphic) { } else if(tb->graphic) {
Bool hasNext = (Bool)(tb->next); Bool hasNext = (tb->next != NULL);
WMDestroyTextBlock(tPtr, WMRemoveTextBlock(tPtr)); WMDestroyTextBlock(tPtr, WMRemoveTextBlock(tPtr));
if(hasNext) { if(hasNext) {

View File

@@ -6,7 +6,7 @@ noinst_PROGRAMS = testdraw testgrad testrot view
EXTRA_DIST = test.png tile.xpm ballot_box.xpm EXTRA_DIST = test.png tile.xpm ballot_box.xpm
INCLUDES = -I.. $(DFLAGS) @HEADER_SEARCH_PATH@ INCLUDES = -I$(srcdir)/.. $(DFLAGS) @HEADER_SEARCH_PATH@
LIBLIST = $(top_builddir)/wrlib/libwraster.la LIBLIST = $(top_builddir)/wrlib/libwraster.la