exmap/gcc44.patch

   1 diff -ru exmap-0.10.orig/jutil/TestRunner.cpp exmap-0.10/jutil/TestRunner.cpp
   2 --- exmap-0.10.orig/jutil/TestRunner.cpp        2009-12-29 22:34:03.284721825 -0500
   3 +++ exmap-0.10/jutil/TestRunner.cpp     2009-12-29 22:35:11.588042553 -0500
   4 @@ -1,5 +1,7 @@
   5  #include "TestRunner.hpp"
   6  #include "Pcre.hpp"
   7 +#include <cstdlib>
   8 +#include <cstdio>
   9
  10  using namespace std;
  11
  12 diff -ru exmap-0.10.orig/jutil/jutil.cpp exmap-0.10/jutil/jutil.cpp
  13 --- exmap-0.10.orig/jutil/jutil.cpp     2009-12-29 22:34:03.284721825 -0500
  14 +++ exmap-0.10/jutil/jutil.cpp  2009-12-29 22:34:46.488033452 -0500
  15 @@ -6,6 +6,8 @@
  16  #include <limits.h>
  17  #include <dirent.h>
  18
  19 +#include <cstring>
  20 +
  21  using namespace std;
  22  using namespace jutil;
  23
  24 diff -ru exmap-0.10.orig/jutil/jutil.hpp exmap-0.10/jutil/jutil.hpp
  25 --- exmap-0.10.orig/jutil/jutil.hpp     2009-12-29 22:34:03.284721825 -0500
  26 +++ exmap-0.10/jutil/jutil.hpp  2009-12-29 22:34:46.491382761 -0500
  27 @@ -7,6 +7,7 @@
  28  #include <map>
  29
  30  #include <stdio.h>
  31 +#include <cstdlib>
  32
  33  // For getuid/setuid
  34  #include <unistd.h>
  35 diff -ru exmap-0.10.orig/kernel/exmap.c exmap-0.10/kernel/exmap.c
  36 --- exmap-0.10.orig/kernel/exmap.c      2009-12-29 22:34:03.284721825 -0500
  37 +++ exmap-0.10/kernel/exmap.c   2009-12-29 22:34:46.491382761 -0500
  38 @@ -507,7 +507,7 @@
  39                                                         NULL);
  40
  41         if (exmap_proc_file == NULL) {
  42 -               remove_proc_entry (PROCFS_NAME, &proc_root);
  43 +               remove_proc_entry (PROCFS_NAME, NULL);
  44                 printk (KERN_ALERT "/proc/%s: could not initialize\n",
  45                         PROCFS_NAME);
  46                 return -ENOMEM;
  47 @@ -532,5 +532,5 @@
  48  void cleanup_module ()
  49  {
  50         printk (KERN_INFO "/proc/%s: remove\n", PROCFS_NAME);
  51 -       remove_proc_entry (PROCFS_NAME, &proc_root);
  52 +       remove_proc_entry (PROCFS_NAME, NULL);
  53  }
  54 diff -ru exmap-0.10.orig/src/Elf.cpp exmap-0.10/src/Elf.cpp
  55 --- exmap-0.10.orig/src/Elf.cpp 2009-12-29 22:34:03.332205805 -0500
  56 +++ exmap-0.10/src/Elf.cpp      2009-12-29 22:34:46.494716705 -0500
  57 @@ -6,6 +6,8 @@
  58  #include <sstream>
  59  #include <unistd.h> // getpagesize()
  60
  61 +#include <cstring>
  62 +
  63  using namespace std;
  64  using namespace jutil;
  65  using namespace Elf;
  66 diff -ru exmap-0.10.orig/src/exmtool.cpp exmap-0.10/src/exmtool.cpp
  67 --- exmap-0.10.orig/src/exmtool.cpp     2009-12-29 22:34:03.334725121 -0500
  68 +++ exmap-0.10/src/exmtool.cpp  2009-12-29 22:34:46.494716705 -0500
  69 @@ -6,6 +6,7 @@
  70  #include <sstream>
  71  #include <iostream>
  72  #include <vector>
  73 +#include <cstring>
  74
  75  using namespace std;
  76  using namespace Exmap;
  77 @@ -18,9 +19,9 @@
  78
  79  struct command
  80  {
  81 -    char *command;
  82 +    const char *command;
  83      Handler handler;
  84 -    char *usage;
  85 +    const char *usage;
  86  } cmd_handles[] = {
  87      { "procs",
  88        do_procs,