Skip to content

Commit ee6f7f2

Browse files
jengelhjames-d-mitchell
jengelh
authored and
james-d-mitchell
committed
build: restore pristine source of EAPS 3.0.1.0
Move digraphs-specific modifications out of the EAPS source code, so that EAPS can easily be updated by just replacing files and not having to look for custom edits.
1 parent 103c03f commit ee6f7f2

21 files changed

Lines changed: 18 additions & 307 deletions

‎Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ ifdef WITH_INCLUDED_PLANARITY
6868
KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/planarityUtils.c
6969
KEXT_SOURCES += $(PLANARITY_SUITE_DIR)/c/stack.c
7070

71-
KEXT_CFLAGS += -I$(PLANARITY_SUITE_DIR)
71+
KEXT_CFLAGS += -I$(PLANARITY_SUITE_DIR) -include extern/eaps_flags.h
7272
else
7373
KEXT_LDFLAGS += -lplanarity
7474
endif

‎extern/eaps_flags.h‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#if defined(__clang__)
2+
#pragma clang diagnostic ignored "-Wdeprecated-non-prototype"
3+
#pragma clang diagnostic ignored "-Wformat-nonliteral"
4+
#pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qualifiers"
5+
#pragma clang diagnostic ignored "-Wmissing-prototypes"
6+
#pragma clang diagnostic ignored "-Wstrict-prototypes"
7+
#endif
8+
#if defined(__GNUC__) && !defined(__clang__)
9+
#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
10+
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
11+
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
12+
#pragma GCC diagnostic ignored "-Wold-style-definition"
13+
#pragma GCC diagnostic ignored "-Wshadow"
14+
#pragma GCC diagnostic ignored "-Wstrict-prototypes"
15+
#pragma GCC diagnostic ignored "-Wswitch-default"
16+
#pragma GCC diagnostic ignored "-Wunused-result"
17+
#endif

‎extern/edge-addition-planarity-suite-Version_3.0.1.0/c/graphDFSUtils.c‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,6 @@ extern void _ClearVertexVisitedFlags(graphP theGraph, int);
2626

2727
#include "platformTime.h"
2828

29-
#if defined(__clang__)
30-
#pragma clang diagnostic push
31-
#pragma clang diagnostic ignored "-Wstrict-prototypes"
32-
#pragma clang diagnostic ignored "-Wmissing-prototypes"
33-
#pragma clang diagnostic ignored "-Wdeprecated-non-prototype"
34-
#elif defined(__GNUC__)
35-
#pragma GCC diagnostic push
36-
#pragma GCC diagnostic ignored "-Wstrict-prototypes"
37-
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
38-
#endif
39-
4029
int gp_CreateDFSTree(graphP theGraph)
4130
{
4231
stackP theStack;
@@ -461,8 +450,3 @@ printf("LeastAncestor in %.3lf seconds.\n", platform_GetDuration(start,end));
461450

462451
return OK;
463452
}
464-
#if defined(__clang__)
465-
#pragma clang diagnostic pop
466-
#elif defined(__GNUC__)
467-
#pragma GCC diagnostic pop
468-
#endif

‎extern/edge-addition-planarity-suite-Version_3.0.1.0/c/graphDrawPlanar.c‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,6 @@ All rights reserved.
44
See the LICENSE.TXT file for licensing information.
55
*/
66

7-
#if defined(__clang__)
8-
#pragma clang diagnostic push
9-
#pragma clang diagnostic ignored "-Wstrict-prototypes"
10-
#pragma clang diagnostic ignored "-Wmissing-prototypes"
11-
#pragma clang diagnostic ignored "-Wdeprecated-non-prototype"
12-
#elif defined(__GNUC__)
13-
#pragma GCC diagnostic push
14-
#pragma GCC diagnostic ignored "-Wstrict-prototypes"
15-
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
16-
#endif
17-
187
#include "graphDrawPlanar.h"
198
#include "graphDrawPlanar.private.h"
209

@@ -1049,8 +1038,3 @@ int v, e, eTwin, EsizeOccupied, epos, eposIndex;
10491038

10501039
return OK;
10511040
}
1052-
#if defined(__clang__)
1053-
#pragma clang diagnostic pop
1054-
#elif defined(__GNUC__)
1055-
#pragma GCC diagnostic pop
1056-
#endif

‎extern/edge-addition-planarity-suite-Version_3.0.1.0/c/graphDrawPlanar_Extensions.c‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,6 @@ All rights reserved.
44
See the LICENSE.TXT file for licensing information.
55
*/
66

7-
#if defined(__clang__)
8-
#pragma clang diagnostic push
9-
#pragma clang diagnostic ignored "-Wstrict-prototypes"
10-
#pragma clang diagnostic ignored "-Wmissing-prototypes"
11-
#pragma clang diagnostic ignored "-Wdeprecated-non-prototype"
12-
#elif defined(__GNUC__)
13-
#pragma GCC diagnostic push
14-
#pragma GCC diagnostic ignored "-Wstrict-prototypes"
15-
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
16-
#endif
17-
187
#include <stdlib.h>
198

209
#include "graphDrawPlanar.private.h"
@@ -689,8 +678,3 @@ int _DrawPlanar_WritePostprocess(graphP theGraph, void **pExtraData, long *pExt
689678

690679
return NOTOK;
691680
}
692-
#if defined(__clang__)
693-
#pragma clang diagnostic pop
694-
#elif defined(__GNUC__)
695-
#pragma GCC diagnostic pop
696-
#endif

‎extern/edge-addition-planarity-suite-Version_3.0.1.0/c/graphEmbed.c‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,6 @@ See the LICENSE.TXT file for licensing information.
88

99
#include "graph.h"
1010

11-
#if defined(__clang__)
12-
#pragma clang diagnostic push
13-
#pragma clang diagnostic ignored "-Wstrict-prototypes"
14-
#pragma clang diagnostic ignored "-Wmissing-prototypes"
15-
#pragma clang diagnostic ignored "-Wdeprecated-non-prototype"
16-
#elif defined(__GNUC__)
17-
#pragma GCC diagnostic push
18-
#pragma GCC diagnostic ignored "-Wstrict-prototypes"
19-
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
20-
#endif
21-
2211
/* Imported functions */
2312

2413
extern void _ClearVertexVisitedFlags(graphP theGraph, int);
@@ -1370,9 +1359,3 @@ int e_u, e_v, e_ulink, e_vlink;
13701359

13711360
return OK;
13721361
}
1373-
1374-
#if defined(__clang__)
1375-
#pragma clang diagnostic pop
1376-
#elif defined(__GNUC__)
1377-
#pragma GCC diagnostic pop
1378-
#endif

‎extern/edge-addition-planarity-suite-Version_3.0.1.0/c/graphExtensions.c‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,6 @@ See the LICENSE.TXT file for licensing information.
1313
#include "graphExtensions.h"
1414
#include "graphFunctionTable.h"
1515

16-
#ifdef __GNUC__
17-
#ifndef __clang__
18-
#pragma GCC diagnostic push
19-
#pragma GCC diagnostic ignored "-Wshadow"
20-
#endif
21-
#endif
22-
2316
/* Imported functions */
2417

2518
extern void _InitFunctionTable(graphP theGraph);
@@ -551,9 +544,3 @@ void _FreeExtension(graphExtensionP extension)
551544
}
552545
free(extension);
553546
}
554-
555-
#ifdef __GNUC__
556-
#ifndef __clang__
557-
#pragma GCC diagnostic pop
558-
#endif
559-
#endif

‎extern/edge-addition-planarity-suite-Version_3.0.1.0/c/graphIO.c‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,6 @@ Copyright (c) 1997-2020, John M. Boyer
33
All rights reserved.
44
See the LICENSE.TXT file for licensing information.
55
*/
6-
#if defined(__clang__)
7-
#pragma clang diagnostic push
8-
#pragma clang diagnostic ignored "-Wstrict-prototypes"
9-
#pragma clang diagnostic ignored "-Wmissing-prototypes"
10-
#pragma clang diagnostic ignored "-Wdeprecated-non-prototype"
11-
#pragma clang diagnostic ignored "-Wincompatible-pointer-types-discards-qualifiers"
12-
#pragma clang diagnostic ignored "-Wformat-nonliteral"
13-
#elif defined(__GNUC__)
14-
#pragma GCC diagnostic push
15-
#pragma GCC diagnostic ignored "-Wstrict-prototypes"
16-
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
17-
#pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
18-
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
19-
#pragma GCC diagnostic ignored "-Wunused-result"
20-
#endif
216

227
#include <stdlib.h>
238
#include <string.h>
@@ -767,8 +752,3 @@ char *_MakeLogStr5(char *format, int one, int two, int three, int four, int five
767752
sprintf(LogStr, format, one, two, three, four, five);
768753
return LogStr;
769754
}
770-
#if defined(__clang__)
771-
#pragma clang diagnostic pop
772-
#elif defined(__GNUC__)
773-
#pragma GCC diagnostic pop
774-
#endif

‎extern/edge-addition-planarity-suite-Version_3.0.1.0/c/graphIsolator.c‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,6 @@ All rights reserved.
44
See the LICENSE.TXT file for licensing information.
55
*/
66

7-
#if defined(__clang__)
8-
#pragma clang diagnostic push
9-
#pragma clang diagnostic ignored "-Wstrict-prototypes"
10-
#pragma clang diagnostic ignored "-Wmissing-prototypes"
11-
#pragma clang diagnostic ignored "-Wdeprecated-non-prototype"
12-
#elif defined(__GNUC__)
13-
#pragma GCC diagnostic push
14-
#pragma GCC diagnostic ignored "-Wstrict-prototypes"
15-
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
16-
#endif
17-
#define GRAPHISOLATOR_C
18-
197
#include "graph.h"
208

219
/* Imported functions */
@@ -833,8 +821,3 @@ int _DeleteUnmarkedVerticesAndEdges(graphP theGraph)
833821

834822
return OK;
835823
}
836-
#if defined(__clang__)
837-
#pragma clang diagnostic pop
838-
#elif defined(__GNUC__)
839-
#pragma GCC diagnostic pop
840-
#endif

‎extern/edge-addition-planarity-suite-Version_3.0.1.0/c/graphK23Search.c‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,6 @@ All rights reserved.
44
See the LICENSE.TXT file for licensing information.
55
*/
66

7-
#if defined(__clang__)
8-
#pragma clang diagnostic push
9-
#pragma clang diagnostic ignored "-Wstrict-prototypes"
10-
#pragma clang diagnostic ignored "-Wmissing-prototypes"
11-
#pragma clang diagnostic ignored "-Wdeprecated-non-prototype"
12-
#elif defined(__GNUC__)
13-
#pragma GCC diagnostic push
14-
#pragma GCC diagnostic ignored "-Wstrict-prototypes"
15-
#pragma GCC diagnostic ignored "-Wmissing-prototypes"
16-
#endif
177
#include "graph.h"
188

199
/* Imported functions */
@@ -273,8 +263,3 @@ int u, d, XorY;
273263
IC->dw = d;
274264
return _IsolateOuterplanarityObstructionA(theGraph);
275265
}
276-
#if defined(__clang__)
277-
#pragma clang diagnostic pop
278-
#elif defined(__GNUC__)
279-
#pragma GCC diagnostic pop
280-
#endif

0 commit comments

Comments
 (0)