[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 09 of 22] Applied some patches from Balaton Zoltan <balaton (at) eik (dot) bme (dot) hu>



# HG changeset patch
# User Dan Pascu <dan@ag-projects.com>
# Date 1137945224 28800
# Branch wm_0_92
# Node ID e397c645f6b7cea7855812573781ddb027405a78
# Parent  345324c47d750b7f1847e926c50f8e044eb4a24f
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
(transplanted from 65dc96c51fa1de53d24068bd518320cba31cc6de)

diff -r 345324c47d75 -r e397c645f6b7 ChangeLog
--- a/ChangeLog	Mon Aug 22 16:58:19 2005 -0700
+++ b/ChangeLog	Sun Jan 22 07:53:44 2006 -0800
@@ -8,6 +8,9 @@
 - fixed gcc-4 compilation issues (Vladimir Nadvornik <nadvornik@suse.cz>)
 - fixed amd64 compilation issues (Vladimir Nadvornik <nadvornik@suse.cz>)
 - 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:
diff -r 345324c47d75 -r e397c645f6b7 WINGs/wbrowser.c
--- a/WINGs/wbrowser.c	Mon Aug 22 16:58:19 2005 -0700
+++ b/WINGs/wbrowser.c	Sun Jan 22 07:53:44 2006 -0800
@@ -188,7 +188,7 @@
     int curMaxVisibleColumns;
     int newFirstVisibleColumn = 0;
 
-    assert ((int) bPtr);
+    assert (bPtr != NULL);
 
     columns = (columns < MIN_VISIBLE_COLUMNS) ? MIN_VISIBLE_COLUMNS : columns;
     columns = (columns > MAX_VISIBLE_COLUMNS) ? MAX_VISIBLE_COLUMNS : columns;
@@ -324,7 +324,7 @@
     WMList **clist;
     char **tlist;
 
-    assert ((int) bPtr);
+    assert (bPtr != NULL);
 
     column = (column < 0) ? 0 : column;
     if (column >= bPtr->columnCount) {
diff -r 345324c47d75 -r e397c645f6b7 WINGs/wtext.c
--- a/WINGs/wtext.c	Mon Aug 22 16:58:19 2005 -0700
+++ b/WINGs/wtext.c	Sun Jan 22 07:53:44 2006 -0800
@@ -1969,7 +1969,7 @@
         } else if(tb->used == 0) {
             tb->blank = 1;
         } else if(tb->graphic) {
-            Bool hasNext = (Bool)(tb->next);
+            Bool hasNext = (tb->next != NULL);
 
             WMDestroyTextBlock(tPtr, WMRemoveTextBlock(tPtr));
             if(hasNext) {
diff -r 345324c47d75 -r e397c645f6b7 wrlib/tests/Makefile.am
--- a/wrlib/tests/Makefile.am	Mon Aug 22 16:58:19 2005 -0700
+++ b/wrlib/tests/Makefile.am	Sun Jan 22 07:53:44 2006 -0800
@@ -6,7 +6,7 @@
 
 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
 


-- 
To unsubscribe, send mail to wmaker-dev-unsubscribe@lists.windowmaker.info.