valgrind fixes, and fixes for writing shit all over the environment. yay~!!!!!!!

[chaz/openbox] / util / xftlsfonts.cc

diff --git a/util/xftlsfonts.cc b/util/xftlsfonts.cc
index e8d6be2d7de72d025740333e2d0b83f1a9844d70..d02758e28b5dfbc21012c5d42217e91785ac98c5 100644 (file)
--- a/util/xftlsfonts.cc
+++ b/util/xftlsfonts.cc
@@ -1,8 +1,14 @@
 const char *NAME = "xftlsfonts";
 const char *VERSION = "1.0";
 
+#ifdef    HAVE_CONFIG_H
+#include "../config.h"
+#endif // HAVE_CONFIG_H
+
 #ifndef   XFT
 #include <iostream>
+using std::cout;
+using std::endl;
 
 int main(int, char **) {
   cout << NAME << " version " << VERSION << endl;
@@ -122,12 +128,14 @@ int main(int argc, char **argv) {
           cout << val.u.b;
           break;
 
+#ifdef XFT_UTF8
         case XftTypeMatrix:
           cout << "xx(" << val.u.m->xx << ") ";
           cout << "xy(" << val.u.m->xy << ") ";
           cout << "yx(" << val.u.m->yx << ") ";
           cout << "yy(" << val.u.m->yy << ")";
           break;
+#endif
         }
       } while ((vallist = vallist->next));
       cout << endl;