From 012f661179ef50dcea4402796f30a2acb7b36c18 Mon Sep 17 00:00:00 2001
From: rathnor <rathnor>
Date: Fri, 3 Sep 2004 17:05:35 +0000
Subject: fix crash on amd64

---
 ChangeLog              | 3 +++
 src/FbTk/XmbFontImp.cc | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ed92e75..5e33c43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 (Format: Year/Month/Day)
 Changes for 0.9.11
 *04/09/03:
+  * Fix crash on startup on amd64 (Simon)
+    - We may need to review usages of 0 as opposed to NULL
+    XmbFontImp.cc
   * Added -nearmouse to FbRun (Mathias)
     main.cc
 *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 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: XmbFontImp.cc,v 1.10 2004/08/31 15:26:39 rathnor Exp $
+// $Id: XmbFontImp.cc,v 1.11 2004/09/03 17:05:35 rathnor Exp $
 
 #include "XmbFontImp.hh"
 
@@ -173,9 +173,9 @@ XFontSet createFontSet(const char *fontname, bool utf8mode) {
     }
 
     getFontElement(fontname, weight, FONT_ELEMENT_SIZE,
-                   "-medium-", "-bold-", "-demibold-", "-regular-", 0);
+                   "-medium-", "-bold-", "-demibold-", "-regular-", NULL);
     getFontElement(fontname, slant, FONT_ELEMENT_SIZE,
-                   "-r-", "-i-", "-o-", "-ri-", "-ro-", 0);
+                   "-r-", "-i-", "-o-", "-ri-", "-ro-", NULL);
     getFontSize(fontname, &pixel_size);
 
     if (! strcmp(weight, "*")) 
-- 
cgit v0.11.2