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

diff --git a/otk/util.hh b/otk/util.hh
index aac92560..22d45fba 100644
--- a/otk/util.hh
+++ b/otk/util.hh
@@ -1,38 +1,21 @@
 // -*- 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>
 #include <X11/Xutil.h>
-
-#ifdef    TIME_WITH_SYS_TIME
-#  include <sys/time.h>
-#  include <time.h>
-#else // !TIME_WITH_SYS_TIME
-#  ifdef    HAVE_SYS_TIME_H
-#    include <sys/time.h>
-#  else // !HAVE_SYS_TIME_H
-#    include <time.h>
-#  endif // HAVE_SYS_TIME_H
-#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 +23,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