Module Name: xsrc
Committed By: mrg
Date: Sun Nov 8 10:17:36 UTC 2009
Modified Files:
xsrc/external/mit/libXft/dist/src: xftdpy.c
Log Message:
don't assign NULL to a integral type.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 xsrc/external/mit/libXft/dist/src/xftdpy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXft/dist/src/xftdpy.c
diff -u xsrc/external/mit/libXft/dist/src/xftdpy.c:1.1.1.2 xsrc/external/mit/libXft/dist/src/xftdpy.c:1.2
--- xsrc/external/mit/libXft/dist/src/xftdpy.c:1.1.1.2 Sun Nov 8 09:43:13 2009
+++ xsrc/external/mit/libXft/dist/src/xftdpy.c Sun Nov 8 10:17:36 2009
@@ -160,7 +160,7 @@
info->next = _XftDisplayInfo;
_XftDisplayInfo = info;
- info->glyph_memory = NULL;
+ info->glyph_memory = 0;
info->max_glyph_memory = XftDefaultGetInteger (dpy,
XFT_MAX_GLYPH_MEMORY, 0,
XFT_DPY_MAX_GLYPH_MEMORY);