blob: bf236574a9533bb6cdc09e5939c9d87bbc6e2a2a (
plain) (
blame)
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
|
--- src/appl/utils/catior/catior.cc.orig Mon Nov 7 22:38:04 2005
+++ src/appl/utils/catior/catior.cc Mon Nov 7 22:38:55 2005
@@ -42,6 +42,12 @@
# include <unistd.h>
#endif
+#ifdef minor
+ // Digital Unix 3.2, and may be others as well, defines minor() as
+ // a macro in its sys/types.h. Get rid of it!
+#undef minor
+#endif
+
#ifndef Swap16
#define Swap16(s) ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff))
#else
--- src/appl/utils/convertior/convertior.cc.orig Mon Nov 7 22:39:11 2005
+++ src/appl/utils/convertior/convertior.cc Mon Nov 7 22:39:28 2005
@@ -40,6 +40,12 @@
# include <unistd.h>
#endif
+#ifdef minor
+ // Digital Unix 3.2, and may be others as well, defines minor() as
+ // a macro in its sys/types.h. Get rid of it!
+#undef minor
+#endif
+
#ifndef Swap16
#define Swap16(s) ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff))
#else
|
