diff options
author | rathnor <rathnor> | 2004-09-03 17:05:35 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2004-09-03 17:05:35 (GMT) |
commit | 012f661179ef50dcea4402796f30a2acb7b36c18 (patch) | |
tree | 757a152985f2729081aec63d0359d6fd97ed3198 | |
parent | d6a32de0f85d80693461574a40b67ad1856bef7f (diff) | |
download | fluxbox-012f661179ef50dcea4402796f30a2acb7b36c18.zip fluxbox-012f661179ef50dcea4402796f30a2acb7b36c18.tar.bz2 |
fix crash on amd64
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | src/FbTk/XmbFontImp.cc | 6 |
2 files changed, 6 insertions, 3 deletions
@@ -1,6 +1,9 @@ | |||
1 | (Format: Year/Month/Day) | 1 | (Format: Year/Month/Day) |
2 | Changes for 0.9.11 | 2 | Changes for 0.9.11 |
3 | *04/09/03: | 3 | *04/09/03: |
4 | * Fix crash on startup on amd64 (Simon) | ||
5 | - We may need to review usages of 0 as opposed to NULL | ||
6 | XmbFontImp.cc | ||
4 | * Added -nearmouse to FbRun (Mathias) | 7 | * Added -nearmouse to FbRun (Mathias) |
5 | main.cc | 8 | main.cc |
6 | *04/09/02: | 9 | *04/09/02: |
diff --git a/src/FbTk/XmbFontImp.cc b/src/FbTk/XmbFontImp.cc index 7afe37c..c8a6291 100644 --- a/src/FbTk/XmbFontImp.cc +++ b/src/FbTk/XmbFontImp.cc | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: XmbFontImp.cc,v 1.10 2004/08/31 15:26:39 rathnor Exp $ | 22 | // $Id: XmbFontImp.cc,v 1.11 2004/09/03 17:05:35 rathnor Exp $ |
23 | 23 | ||
24 | #include "XmbFontImp.hh" | 24 | #include "XmbFontImp.hh" |
25 | 25 | ||
@@ -173,9 +173,9 @@ XFontSet createFontSet(const char *fontname, bool utf8mode) { | |||
173 | } | 173 | } |
174 | 174 | ||
175 | getFontElement(fontname, weight, FONT_ELEMENT_SIZE, | 175 | getFontElement(fontname, weight, FONT_ELEMENT_SIZE, |
176 | "-medium-", "-bold-", "-demibold-", "-regular-", 0); | 176 | "-medium-", "-bold-", "-demibold-", "-regular-", NULL); |
177 | getFontElement(fontname, slant, FONT_ELEMENT_SIZE, | 177 | getFontElement(fontname, slant, FONT_ELEMENT_SIZE, |
178 | "-r-", "-i-", "-o-", "-ri-", "-ro-", 0); | 178 | "-r-", "-i-", "-o-", "-ri-", "-ro-", NULL); |
179 | getFontSize(fontname, &pixel_size); | 179 | getFontSize(fontname, &pixel_size); |
180 | 180 | ||
181 | if (! strcmp(weight, "*")) | 181 | if (! strcmp(weight, "*")) |