include stdio

[chaz/openbox] / otk / util.hh

diff --git a/otk/util.hh b/otk/util.hh
index 2325ebf0b813ff0b38ae5a0bceb48caac82bd5c9..e00a4e1b60b444ebe2a3cef4e85d874545efaa4f 100644 (file)
--- a/otk/util.hh
+++ b/otk/util.hh
@@ -1,6 +1,6 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
-#ifndef _BLACKBOX_UTIL_HH
-#define _BLACKBOX_UTIL_HH
+#ifndef __util_hh
+#define __util_hh
 
 extern "C" {
 #include <X11/Xlib.h>
@@ -18,21 +18,15 @@ extern "C" {
 #endif // TIME_WITH_SYS_TIME
 }
 
-
 #include <string>
 #include <vector>
 
 namespace otk {
 
-/* XXX: this needs autoconf help */
-const unsigned int BSENTINEL = 65535;
-
 std::string expandTilde(const std::string& s);
 
 void bexec(const std::string& command, const std::string& displaystring);
 
-std::string textPropertyToString(Display *display, XTextProperty& text_prop);
-
 std::string itostring(unsigned long i);
 std::string itostring(long i);
 inline std::string itostring(unsigned int i)
@@ -46,4 +40,4 @@ std::string basename(const std::string& path);
 
 }
 
-#endif
+#endif // __util_hh