diff options
Diffstat (limited to 'sysutils/xosview/patches/patch-am')
| -rw-r--r-- | sysutils/xosview/patches/patch-am | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/sysutils/xosview/patches/patch-am b/sysutils/xosview/patches/patch-am index 5dc2fa9f273..bb33d551a0e 100644 --- a/sysutils/xosview/patches/patch-am +++ b/sysutils/xosview/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.1 2003/09/30 23:03:59 christos Exp $ +$NetBSD: patch-am,v 1.2 2003/10/01 00:33:54 christos Exp $ --- Xrm.cc.orig 1999-02-16 09:08:35.000000000 -0500 +++ Xrm.cc 2003-09-30 18:44:38.000000000 -0400 @@ -75,38 +75,19 @@ $NetBSD: patch-am,v 1.1 2003/09/30 23:03:59 christos Exp $ int i = 0; while (quarks[i] != NULLQUARK){ --- Xrm.h.orig 1999-02-16 09:08:34.000000000 -0500 -+++ Xrm.h 2003-09-30 19:01:04.000000000 -0400 -@@ -10,14 +10,13 @@ - #define _Xrm_h - - #include "bool.h" -+#include <iostream> - - #define XRM_H_CVSID "$Id: patch-am,v 1.1 2003/09/30 23:03:59 christos Exp $" - - #include <X11/Xlib.h> - #include <X11/Xresource.h> ++++ Xrm.h 2003-09-30 20:29:33.000000000 -0400 +@@ -18,4 +18,2 @@ -class ostream; - class Xrm { - public: - Xrm(const char *className, const char *instanceName); -@@ -31,7 +30,7 @@ - const char* getDisplayName (int argc, char** argv); - void loadAndMergeResources(int& argc, char** argv, Display* display); +@@ -33,3 +31,3 @@ - ostream &dump(ostream &os) const; + std::ostream &dump(std::ostream &os) const; - private: - XrmDatabase _db; -@@ -47,7 +46,7 @@ - static bool _initialized; - }; +@@ -49,3 +47,3 @@ -inline ostream &operator<<(ostream &os, const Xrm &xrm){ +inline std::ostream &operator<<(std::ostream &os, const Xrm &xrm){ return xrm.dump(os); - } - |