nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix size_t issues and other 64bit-highlighted warnings

Browse source
This commit is contained in:
simonb 2006-04-06 13:59:52 +00:00
parent 8c12c5ecaf
commit e337c67566
4 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
(Format: Year/Month/Day) (Format: Year/Month/Day)
Changes for 0.9.16: Changes for 0.9.16:
*06/04/06:
* Fix build on amd64 - some more size_t propagation and includes
(Simon)
FbTk/... Text.hh/cc Font.cc
*06/04/05: *06/04/05:
* Fix gcc 2.95.4 build error in ScreenPlacement.hh (Simon) * Fix gcc 2.95.4 build error in ScreenPlacement.hh (Simon)
ScreenPlacement.hh ScreenPlacement.hh

2
src/FbTk/Font.cc
View file

@ -250,7 +250,7 @@ Font::Font(const char *name):
} }
#ifdef DEBUG #ifdef DEBUG
cerr<<"FbTk::Font m_iconv = "<<(int)m_iconv<<endl; cerr<<"FbTk::Font m_iconv = "<<m_iconv<<endl;
#endif // DEBUG #endif // DEBUG
if (name != 0) { if (name != 0) {

2
src/FbTk/Text.cc
View file

@ -32,7 +32,7 @@ namespace FbTk {
int doAlignment(int max_width, int bevel, FbTk::Justify justify, int doAlignment(int max_width, int bevel, FbTk::Justify justify,
const FbTk::Font &font, const char * const text, const FbTk::Font &font, const char * const text,
unsigned int textlen, unsigned int &newlen) { size_t textlen, size_t &newlen) {
if (text == 0 || textlen == 0) if (text == 0 || textlen == 0)
return 0; return 0;

4
src/FbTk/Text.hh
View file

@ -24,6 +24,8 @@
#ifndef FBTK_TEXT_HH #ifndef FBTK_TEXT_HH
#define FBTK_TEXT_HH #define FBTK_TEXT_HH
#include <sys/types.h>
namespace FbTk { namespace FbTk {
class Font; class Font;
@ -37,7 +39,7 @@ enum Orientation { ROT0=0, ROT90, ROT180, ROT270 };
*/ */
int doAlignment(int max_width, int bevel, FbTk::Justify justify, int doAlignment(int max_width, int bevel, FbTk::Justify justify,
const FbTk::Font &font, const char * const text, const FbTk::Font &font, const char * const text,
unsigned int textlen, unsigned int &newlen); size_t textlen, size_t &newlen);
/** /**
There are 3 interesting translations: There are 3 interesting translations: