aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonb <simonb>2006-04-06 13:59:52 (GMT)
committersimonb <simonb>2006-04-06 13:59:52 (GMT)
commite337c67566ab8dd722ac2e93edeb10098ab60154 (patch)
tree3fa6a60dab5747e3c5007880f32b0b70c33304a2
parent8c12c5ecaf4ec6e1ad729115732f5579cbd4a788 (diff)
downloadfluxbox_paul-e337c67566ab8dd722ac2e93edeb10098ab60154.zip
fluxbox_paul-e337c67566ab8dd722ac2e93edeb10098ab60154.tar.bz2
fix size_t issues and other 64bit-highlighted warnings
-rw-r--r--ChangeLog4
-rw-r--r--src/FbTk/Font.cc2
-rw-r--r--src/FbTk/Text.cc2
-rw-r--r--src/FbTk/Text.hh4
4 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 035a758..beb4259 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.16: 2Changes for 0.9.16:
3*06/04/06:
4 * Fix build on amd64 - some more size_t propagation and includes
5 (Simon)
6 FbTk/... Text.hh/cc Font.cc
3*06/04/05: 7*06/04/05:
4 * Fix gcc 2.95.4 build error in ScreenPlacement.hh (Simon) 8 * Fix gcc 2.95.4 build error in ScreenPlacement.hh (Simon)
5 ScreenPlacement.hh 9 ScreenPlacement.hh
diff --git a/src/FbTk/Font.cc b/src/FbTk/Font.cc
index a946915..8d8fbec 100644
--- a/src/FbTk/Font.cc
+++ b/src/FbTk/Font.cc
@@ -250,7 +250,7 @@ Font::Font(const char *name):
250 } 250 }
251 251
252#ifdef DEBUG 252#ifdef DEBUG
253 cerr<<"FbTk::Font m_iconv = "<<(int)m_iconv<<endl; 253 cerr<<"FbTk::Font m_iconv = "<<m_iconv<<endl;
254#endif // DEBUG 254#endif // DEBUG
255 255
256 if (name != 0) { 256 if (name != 0) {
diff --git a/src/FbTk/Text.cc b/src/FbTk/Text.cc
index b474022..d17aaac 100644
--- a/src/FbTk/Text.cc
+++ b/src/FbTk/Text.cc
@@ -32,7 +32,7 @@ namespace FbTk {
32 32
33int doAlignment(int max_width, int bevel, FbTk::Justify justify, 33int doAlignment(int max_width, int bevel, FbTk::Justify justify,
34 const FbTk::Font &font, const char * const text, 34 const FbTk::Font &font, const char * const text,
35 unsigned int textlen, unsigned int &newlen) { 35 size_t textlen, size_t &newlen) {
36 36
37 if (text == 0 || textlen == 0) 37 if (text == 0 || textlen == 0)
38 return 0; 38 return 0;
diff --git a/src/FbTk/Text.hh b/src/FbTk/Text.hh
index 5336546..01ee26e 100644
--- a/src/FbTk/Text.hh
+++ b/src/FbTk/Text.hh
@@ -24,6 +24,8 @@
24#ifndef FBTK_TEXT_HH 24#ifndef FBTK_TEXT_HH
25#define FBTK_TEXT_HH 25#define FBTK_TEXT_HH
26 26
27#include <sys/types.h>
28
27namespace FbTk { 29namespace FbTk {
28 30
29class Font; 31class Font;
@@ -37,7 +39,7 @@ enum Orientation { ROT0=0, ROT90, ROT180, ROT270 };
37 */ 39 */
38int doAlignment(int max_width, int bevel, FbTk::Justify justify, 40int doAlignment(int max_width, int bevel, FbTk::Justify justify,
39 const FbTk::Font &font, const char * const text, 41 const FbTk::Font &font, const char * const text,
40 unsigned int textlen, unsigned int &newlen); 42 size_t textlen, size_t &newlen);
41 43
42/** 44/**
43 There are 3 interesting translations: 45 There are 3 interesting translations: