Attachment 168982 Details for Bug 208528 – Remove C++ keyword overriding defines from devel/ddd

[patch] Remove C++ keyword overriding defines from devel/ddd

devel__ddd-remove-keyword-defines-1.diff (text/plain), 6.73 KB, created by Dimitry Andric on 2016-04-04 19:39:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2016-04-04 19:39:33 UTC

Size: 6.73 KB

patch

obsolete

>Index: devel/ddd/files/patch-ddd-GraphEditP.h
>===================================================================
>--- devel/ddd/files/patch-ddd-GraphEditP.h	(nonexistent)
>+++ devel/ddd/files/patch-ddd-GraphEditP.h	(working copy)
>@@ -0,0 +1,18 @@
>+--- ddd/GraphEditP.h.orig	2009-02-11 18:25:06.000000000 +0100
>++++ ddd/GraphEditP.h	2016-04-04 21:29:40.084971000 +0200
>+@@ -30,15 +30,11 @@
>+ 
>+ // Superclasses
>+ extern "C" {
>+-#define new new_w
>+-#define class class_w
>+ #include <X11/CoreP.h>
>+ #include <Xm/XmP.h>
>+ #if XmVersion >= 1002
>+ #include <Xm/PrimitiveP.h>
>+ #endif
>+-#undef new
>+-#undef class
>+ }
>+ 
>+ // This class
>
>Property changes on: devel/ddd/files/patch-ddd-GraphEditP.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ddd/files/patch-ddd-LabelH.C
>===================================================================
>--- devel/ddd/files/patch-ddd-LabelH.C	(nonexistent)
>+++ devel/ddd/files/patch-ddd-LabelH.C	(working copy)
>@@ -0,0 +1,20 @@
>+--- ddd/LabelH.C.orig	2009-02-11 18:25:07.000000000 +0100
>++++ ddd/LabelH.C	2016-04-04 21:29:40.083516000 +0200
>+@@ -30,8 +30,6 @@
>+  *  cwikla@wolfram.com
>+ */
>+ 
>+-#define new a_new		// Motif 1.1 wants this
>+-#define class a_class
>+ extern "C" {
>+ #include <Xm/XmP.h>
>+ #include <Xm/LabelP.h>
>+@@ -41,8 +39,6 @@ extern "C" {
>+ #include <Xm/ManagerP.h>
>+ #endif
>+ }
>+-#undef new
>+-#undef class
>+ 
>+ #include "LabelHP.h"
>+ #include "casts.h"
>
>Property changes on: devel/ddd/files/patch-ddd-LabelH.C
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ddd/files/patch-ddd-PannedGEP.h
>===================================================================
>--- devel/ddd/files/patch-ddd-PannedGEP.h	(nonexistent)
>+++ devel/ddd/files/patch-ddd-PannedGEP.h	(working copy)
>@@ -0,0 +1,18 @@
>+--- ddd/PannedGEP.h.orig	2009-02-11 18:25:06.000000000 +0100
>++++ ddd/PannedGEP.h	2016-04-04 21:29:40.083754000 +0200
>+@@ -32,15 +32,11 @@
>+ #include <Xm/Xm.h>
>+ 
>+ // Superclasses
>+-#define new new_w
>+-#define class class_w
>+ extern "C" {
>+ #include <X11/IntrinsicP.h>
>+ #include <X11/CompositeP.h>
>+ #include <X11/Xaw/PortholeP.h>
>+ }
>+-#undef new
>+-#undef class
>+ 
>+ // This class
>+ #include "PannedGE.h"
>
>Property changes on: devel/ddd/files/patch-ddd-PannedGEP.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ddd/files/patch-ddd-Sash.h
>===================================================================
>--- devel/ddd/files/patch-ddd-Sash.h	(nonexistent)
>+++ devel/ddd/files/patch-ddd-Sash.h	(working copy)
>@@ -0,0 +1,14 @@
>+--- ddd/Sash.h.orig	2009-02-11 18:25:06.000000000 +0100
>++++ ddd/Sash.h	2016-04-04 21:29:40.084679000 +0200
>+@@ -29,11 +29,7 @@
>+ #define _DDD_Sash_h
>+ 
>+ extern "C" {
>+-#define new new_w
>+-#define class class_w
>+ #include <Xm/SashP.h>		// XmIsSash()
>+-#undef class
>+-#undef new
>+ }
>+ 
>+ #endif // _DDD_Sash_h
>
>Property changes on: devel/ddd/files/patch-ddd-Sash.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ddd/files/patch-ddd-ScrolleGEP.h
>===================================================================
>--- devel/ddd/files/patch-ddd-ScrolleGEP.h	(nonexistent)
>+++ devel/ddd/files/patch-ddd-ScrolleGEP.h	(working copy)
>@@ -0,0 +1,16 @@
>+--- ddd/ScrolleGEP.h.orig	2009-02-11 18:25:07.000000000 +0100
>++++ ddd/ScrolleGEP.h	2016-04-04 21:29:40.085223000 +0200
>+@@ -31,13 +31,9 @@
>+ #include <Xm/Xm.h>
>+ 
>+ // Superclasses
>+-#define new new_w
>+-#define class class_w
>+ #include <Xm/XmP.h>
>+ #include <X11/CoreP.h>
>+ #include <Xm/ScrolledWP.h>
>+-#undef new
>+-#undef class
>+ 
>+ #ifdef MAX
>+ #undef MAX			// <Xm/XmP.h> on HP-UX defines this
>
>Property changes on: devel/ddd/files/patch-ddd-ScrolleGEP.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ddd/files/patch-ddd-SwallowerP.h
>===================================================================
>--- devel/ddd/files/patch-ddd-SwallowerP.h	(nonexistent)
>+++ devel/ddd/files/patch-ddd-SwallowerP.h	(working copy)
>@@ -0,0 +1,14 @@
>+--- ddd/SwallowerP.h.orig	2009-02-11 18:25:07.000000000 +0100
>++++ ddd/SwallowerP.h	2016-04-04 21:29:40.084451000 +0200
>+@@ -35,11 +35,7 @@
>+ 
>+ // Superclasses
>+ extern "C" {
>+-#define new new_w
>+-#define class class_w
>+ #include <X11/CoreP.h>
>+-#undef new
>+-#undef class
>+ }
>+ 
>+ // The Swallower class record
>
>Property changes on: devel/ddd/files/patch-ddd-SwallowerP.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: devel/ddd/files/patch-ddd-converters.C
>===================================================================
>--- devel/ddd/files/patch-ddd-converters.C	(nonexistent)
>+++ devel/ddd/files/patch-ddd-converters.C	(working copy)
>@@ -0,0 +1,22 @@
>+--- ddd/converters.C.orig	2009-02-11 18:25:07.000000000 +0100
>++++ ddd/converters.C	2016-04-04 21:29:40.084242000 +0200
>+@@ -56,9 +56,6 @@ char converters_rcsid[] = 
>+ 
>+ #include <Xm/Xm.h>
>+ 
>+-#define new new_w
>+-#define class class_w
>+-
>+ #if XmVersion < 1002
>+ #include <Xm/bitmaps.h>
>+ #else
>+@@ -101,9 +98,6 @@ extern "C" {
>+ #include <Xm/PrimitiveP.h>
>+ #endif
>+ 
>+-#undef new
>+-#undef class
>+-
>+ #include "converters.h"
>+ #include "MString.h"
>+ 
>
>Property changes on: devel/ddd/files/patch-ddd-converters.C
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 208528: 168982