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
|
--- pbmplus.h.orig Sat May 27 03:50:50 2000
+++ pbmplus.h Sat Jun 3 00:00:00 2000
@@ -18,6 +18,9 @@
#include <stdio.h>
#include <errno.h>
#include <sys/stat.h>
+#if (defined(__unix__) || defined(unix)) && !defined(USG)
+#include <sys/param.h>
+#endif
#ifdef VMS
#include <perror.h>
@@ -32,7 +35,7 @@
** and if you run on an Amiga, set AMIGA. If your compiler is ANSI C, you're
** probably better off setting SYSV - all it affects is string handling.
*/
-#define BSD
+/* #define BSD */
/* #define SYSV */
/* #define MSDOS */
/* #define AMIGA */
@@ -51,7 +54,7 @@
#define RGB_DB1 "PBMplus_Dir:RGB.TXT"
#define RGB_DB2 "PBMplus_Dir:RGB.TXT"
#else
-#define RGB_DB1 "/usr/lib/X11/rgb.txt"
+#define RGB_DB1 "%%X11BASE%%/lib/X11/rgb.txt"
#define RGB_DB2 "/usr/openwin/lib/rgb.txt"
#endif
@@ -299,37 +302,6 @@
PM_CHECK_BASIC
};
-
-/* By making this <> instead of "", we avoid making shhopt.h a dependency
- of every program in the package when we do make dep.
-*/
-#include <shhopt.h>
-
-void pm_optParseOptions(int *argc, char *argv[],
- optStruct opt[], int allowNegNum);
-/* Use pm_optParseOptions instead of optParseOptions in order to use the
- shared Netpbm libraries
-*/
-
-/* You can use OPTENTRY to assign a value to a dynamically or automatically
- allocated optStruct structure with minimal typing and easy readability.
-
- Here is an example:
-
- unsigned int option_def_index = 0;
- optStruct *option_def = malloc(100*sizeof(optStruct));
- OPTENTRY('h', "help", OPT_FLAG, &help_flag, 0);
- OPTENTRY(0, "alphaout", OPT_STRING, &alpha_filename, 0);
-*/
-
-#define OPTENTRY(shortvalue,longvalue,typevalue,outputvalue,flagvalue) {\
- option_def[option_def_index].shortName = (shortvalue); \
- option_def[option_def_index].longName = (longvalue); \
- option_def[option_def_index].type = (typevalue); \
- option_def[option_def_index].arg = (outputvalue); \
- option_def[option_def_index].flags = (flagvalue); \
- option_def[++option_def_index].type = OPT_END; \
- }
/* Compatibility stuff */
|
