X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Futil.hh;h=e00a4e1b60b444ebe2a3cef4e85d874545efaa4f;hb=41a03629c9f166f7a1b427ed1634b44c6c38da6e;hp=aac92560ed64d42158208d30ef55942f348b7cfb;hpb=35fcb62ddd4861f857d93941407e3d87d444b2cc;p=chaz%2Fopenbox

diff --git a/otk/util.hh b/otk/util.hh
index aac92560..e00a4e1b 100644
--- 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)
@@ -40,10 +34,10 @@ inline std::string itostring(unsigned int i)
 inline std::string itostring(int i)
   { return itostring((long) i); }
 
-}
+void putenv(const std::string &data);
 
-#ifndef   HAVE_BASENAME
 std::string basename(const std::string& path);
-#endif
 
-#endif
+}
+
+#endif // __util_hh