devel/ddd: Fix build with libc++ 3.8.0

PR:		208528
Submitted by:	dim
Approved by:	sergio@softshark.org (maintainer timeout)
This commit is contained in:
Kurt Jaeger 2016-04-29 21:13:28 +00:00
parent 5f1fac2a4e
commit 9d76b86b5b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=414293
7 changed files with 122 additions and 0 deletions

View file

@ -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

View file

@ -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"

View file

@ -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"

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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"