sync with the 2.0 branch

[chaz/openbox] / util / bsetroot.cc

diff --git a/util/bsetroot.cc b/util/bsetroot.cc
index 21cb3647ede4f4d0a97f32a2f8a92178fe0f2488..460dc350ac9891803a31452cee22b7526309ac89 100644 (file)
--- a/util/bsetroot.cc
+++ b/util/bsetroot.cc
@@ -1,4 +1,4 @@
-// -*- mode++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 // bsetroot.cc for Blackbox - an X11 Window manager
 // Copyright (c) 2001 - 2002 Sean 'Shaleh' Perry <shaleh at debian.org>
 // Copyright (c) 1997 - 2000, 2002 Brad Hughes <bhughes at trolltech.com>
@@ -37,9 +37,11 @@ extern "C" {
 #ifdef    HAVE_STDIO_H
 #  include <stdio.h>
 #endif // HAVE_STDIO_H
-}
 
-#include <cctype>
+#ifdef    HAVE_CTYPE_H
+# include <ctype.h>
+#endif // HAVE_CTYPE_H
+}
 
 #include "../src/i18n.hh"
 #include "../src/GCCache.hh"
@@ -303,7 +305,7 @@ void bsetroot::gradient(void) {
 
   std::string::const_iterator it = grad.begin(), end = grad.end();
   for (; it != end; ++it)
-    descr += std::tolower(*it);
+    descr += tolower(*it);
 
   std::string::size_type pos;
   while ((pos = descr.find("raised")) != std::string::npos)
@@ -350,7 +352,7 @@ void bsetroot::usage(int exit_code) {
                 "%s 2.0\n\n"
                 "Copyright (c) 1997-2000, 2002 Bradley T Hughes\n"
                 "Copyright (c) 2001-2002 Sean 'Shaleh' Perry\n\n"
-                "  -display <string>        display connection\n"
+                "  -display <string>        use display connection\n"
                 "  -mod <x> <y>             modula pattern\n"
                 "  -foreground, -fg <color> modula foreground color\n"
                 "  -background, -bg <color> modula background color\n\n"