wmi/wmi-10-compile-fixes.patch

   1 diff -r 6b4e7138042b src/action.cpp
   2 --- a/src/action.cpp    Sat Jan 27 17:29:39 2007 +0300
   3 +++ b/src/action.cpp    Sun Jul 13 22:21:27 2008 +0400
   4 @@ -2,6 +2,11 @@
   5  // See ../LICENSE.txt for license details.
   6  //
   7  // $Id: action.cpp 734 2004-09-27 18:15:45Z garbeam $
   8 +
   9 +extern "C" {
  10 +#include <stdlib.h> // free
  11 +#include <string.h> // strdup
  12 +}
  13
  14  #include <string>
  15  #include "wmi.h"
  16 diff -r 6b4e7138042b src/frame.h
  17 --- a/src/frame.h       Sat Jan 27 17:29:39 2007 +0300
  18 +++ b/src/frame.h       Sun Jul 13 22:21:27 2008 +0400
  19 @@ -35,7 +35,7 @@
  20      void focus(Client *client);
  21
  22      void attach(Client *client);
  23 -    Client *Frame::detach(Client *client);
  24 +    Client *detach(Client *client);
  25
  26      virtual Window window();
  27
  28 diff -r 6b4e7138042b src/inputbar.cpp
  29 --- a/src/inputbar.cpp  Sat Jan 27 17:29:39 2007 +0300
  30 +++ b/src/inputbar.cpp  Sun Jul 13 22:21:27 2008 +0400
  31 @@ -31,7 +31,7 @@
  32      prompt_ = 0;
  33      promptCounter_ = 0;
  34      isArgument_ = false;
  35 -    entryBegin_ = entryEnd_ = 0;
  36 +    entryBegin_ = entryEnd_ = (Sstring::iterator)0;
  37      partitionBegin_ = selected_ = entryBegin_;
  38      args_ = "";
  39      LOGDEBUG("creating input");
  40 @@ -233,7 +233,7 @@
  41          clearPrevPartitionsStack();
  42      }
  43      else {
  44 -        entryBegin_ = entryEnd_ = 0;
  45 +        entryBegin_ = entryEnd_ = (Sstring::iterator)0;
  46          partitionBegin_ = selected_ = entryBegin_;
  47          text_ = text;
  48      }
  49 diff -r 6b4e7138042b src/kernel.h
  50 --- a/src/kernel.h      Sat Jan 27 17:29:39 2007 +0300
  51 +++ b/src/kernel.h      Sun Jul 13 22:21:27 2008 +0400
  52 @@ -167,7 +167,7 @@
  53
  54      void cleanup();
  55
  56 -    Prompt *Kernel::defaultPrompt() const;
  57 +    Prompt *defaultPrompt() const;
  58
  59      void setMenuMode(bool isMenuMode);
  60
  61 diff -r 6b4e7138042b src/logger.cpp
  62 --- a/src/logger.cpp    Sat Jan 27 17:29:39 2007 +0300
  63 +++ b/src/logger.cpp    Sun Jul 13 22:21:27 2008 +0400
  64 @@ -2,6 +2,10 @@
  65  // See ../LICENSE.txt for license details.
  66  //
  67  // $Id: logger.cpp 734 2004-09-27 18:15:45Z garbeam $
  68 +
  69 +extern "C" {
  70 +#include <stdlib.h> // exit
  71 +}
  72
  73  #include <iostream>
  74
  75 diff -r 6b4e7138042b src/main.cpp
  76 --- a/src/main.cpp      Sat Jan 27 17:29:39 2007 +0300
  77 +++ b/src/main.cpp      Sun Jul 13 22:21:27 2008 +0400
  78 @@ -10,6 +10,7 @@
  79  #include <assert.h>
  80  #include <unistd.h> // getopt stuff
  81  #include <stdlib.h> // getenv stuff
  82 +#include <string.h> // strlen
  83  #include <X11/Xlib.h>
  84  }
  85
  86 diff -r 6b4e7138042b src/util.cpp
  87 --- a/src/util.cpp      Sat Jan 27 17:29:39 2007 +0300
  88 +++ b/src/util.cpp      Sun Jul 13 22:21:27 2008 +0400
  89 @@ -5,6 +5,7 @@
  90
  91  extern "C" {
  92  #include <unistd.h>
  93 +#include <stdlib.h> // atoi
  94  #include <X11/Xlib.h>
  95  }
  96
  97 diff -r 6b4e7138042b src/wmiremote.cpp
  98 --- a/src/wmiremote.cpp Sat Jan 27 17:29:39 2007 +0300
  99 +++ b/src/wmiremote.cpp Sun Jul 13 22:21:27 2008 +0400
 100 @@ -7,6 +7,7 @@
 101
 102  extern "C" {
 103  #include <unistd.h> // getopt stuff
 104 +#include <stdlib.h> // exit
 105  #include <X11/Xatom.h>
 106  #include <X11/Xlib.h>
 107  #include <X11/Xutil.h>