accessx/accessx-0951.patch

   1 diff -ur accessx.orig/Access.C accessx/Access.C
   2 --- accessx.orig/Access.C       2003-09-19 19:08:01.000000000 +0300
   3 +++ accessx/Access.C    2008-01-07 18:53:43.000000000 +0200
   4 @@ -22,6 +22,8 @@
   5  #include <X11/XKBlib.h>
   6  #include "Access.h"
   7
   8 +using namespace std;
   9 +
  10  //
  11  // Access()
  12  //
  13 @@ -153,7 +155,7 @@
  14      //Get the state of the keyboard.
  15
  16      XkbDescPtr xkb = XkbGetMap(display, 0, XkbUseCoreKbd);
  17 -    if ((int)xkb == BadAlloc || xkb == NULL)
  18 +    if (xkb == NULL)
  19        {
  20         return 5; /*AccessKeyboardQueryFailure;*/
  21        }
  22 @@ -262,7 +264,7 @@
  23      //Get the state of the keyboard.
  24
  25      XkbDescPtr xkb = XkbGetMap(display, 0, XkbUseCoreKbd);
  26 -    if ((int)xkb == BadAlloc || xkb == NULL)
  27 +    if (xkb == NULL)
  28        {
  29         return 5; /*AccessKeyboardQueryFailure;*/
  30        }
  31 diff -ur accessx.orig/Access.h accessx/Access.h
  32 --- accessx.orig/Access.h       2003-09-19 19:00:42.000000000 +0300
  33 +++ accessx/Access.h    2008-01-07 18:53:47.000000000 +0200
  34 @@ -21,7 +21,7 @@
  35   *
  36   */
  37
  38 -#include <iostream.h>
  39 +#include <iostream>
  40  #include <math.h>
  41
  42  inline char* onoroff(int val)
  43 diff -ur accessx.orig/ax.C accessx/ax.C
  44 --- accessx.orig/ax.C   2003-09-19 19:09:31.000000000 +0300
  45 +++ accessx/ax.C        2008-01-07 18:53:49.000000000 +0200
  46 @@ -20,6 +20,7 @@
  47
  48  #include "ax.h"
  49
  50 +using namespace std;
  51
  52  ///////////////////////////////////////////////////////////////////////////////
  53  //
  54 diff -ur accessx.orig/ax.h accessx/ax.h
  55 --- accessx.orig/ax.h   2003-09-19 19:06:56.000000000 +0300
  56 +++ accessx/ax.h        2008-01-07 18:53:51.000000000 +0200
  57 @@ -24,7 +24,7 @@
  58
  59  // Include Files
  60
  61 -#include <iostream.h>
  62 +#include <iostream>
  63  #include <stdio.h>
  64  #include <stdlib.h>
  65  #include <string.h>