1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
|
From: Stephane Glondu <steph@glondu.net>
Date: Thu, 30 Jan 2020 08:33:00 +0100
Subject: Replace IFDEF macros by cppo's #ifdef
---
cairost.ml | 6 +++---
concrete.ml | 6 +++---
concrete/ctypes.mli | 6 +++---
mlpost.mli | 12 ++++++------
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/cairost.ml b/cairost.ml
index c451254..0a1b5a6 100644
--- a/cairost.ml
+++ b/cairost.ml
@@ -14,7 +14,7 @@
(* *)
(**************************************************************************)
-IFDEF CAIRO THEN
+#ifdef CAIRO
let supported = true
module M = Mps
@@ -65,7 +65,7 @@ let dump_ps = dump_ext "ps" emit_ps
let dump_png = dump_ext "png" emit_png
let dump_svg = dump_ext "svg" emit_svg
-ELSE
+#else
let supported = false
@@ -90,4 +90,4 @@ type cairo_t = unit
let emit_cairo _ _ _ = failwith "Cairost.emit_cairo : not supported"
-END
+#endif
diff --git a/concrete.ml b/concrete.ml
index e026d7d..cdea5e7 100644
--- a/concrete.ml
+++ b/concrete.ml
@@ -14,7 +14,7 @@
(* *)
(**************************************************************************)
-IFDEF CONCRETE THEN
+#ifdef CONCRETE
let supported = true
type cnum = float
@@ -94,7 +94,7 @@ let path_of_cpath p =
let transform_of_ctransform x = [x]
-ELSE
+#else
let supported = false
let not_supported s = failwith ("Concrete."^s^" : not supported")
@@ -183,4 +183,4 @@ let point_of_cpoint p = not_supported "point_of_cpoint"
let path_of_cpath p = not_supported "path_of_cpath"
let transform_of_ctransform _ = not_supported "transform_of_ctransform"
let baselines p = not_supported "baselines"
-END
+#endif
diff --git a/concrete/ctypes.mli b/concrete/ctypes.mli
index 1464510..90f5810 100644
--- a/concrete/ctypes.mli
+++ b/concrete/ctypes.mli
@@ -1,14 +1,14 @@
-IFDEF CAIRO THEN
+#ifdef CAIRO
type matrix = Cairo.matrix =
{ xx : float; yx : float; xy : float; yy : float; x0 : float; y0 : float; }
type point = Cairo.point =
{x : float;
y : float}
-ELSE
+#else
type matrix =
{ xx : float; yx : float; xy : float; yy : float; x0 : float; y0 : float; }
type point = {x : float; y : float}
-END
+#endif
diff --git a/mlpost.mli b/mlpost.mli
index 5eae3c6..7e66400 100644
--- a/mlpost.mli
+++ b/mlpost.mli
@@ -35,19 +35,19 @@ end
module Ctypes : sig
- IFDEF CAIRO THEN
+#ifdef CAIRO
type matrix = Cairo.matrix =
{ xx : float; yx : float; xy : float; yy : float; x0 : float; y0 : float;}
type point = Cairo.point =
{x : float;
y : float}
- ELSE
+#else
type matrix =
{ xx : float; yx : float; xy : float; yy : float; x0 : float; y0 : float;}
type point = {x : float; y : float}
- END
+#endif
end
@@ -2811,11 +2811,11 @@ module Cairost : sig
val generate_pdfs : string ->
(int * Command.t) list -> unit
- IFDEF CAIRO THEN
+#ifdef CAIRO
type cairo_t = Cairo.t
- ELSE
+#else
type cairo_t
- END
+#endif
val emit_cairo : cairo_t -> float * float -> Command.t -> unit
|
