Debianization fixes.

[xtoys] / xscsize.c

diff --git a/xscsize.c b/xscsize.c
index bae703d..3d9d7ce 100644 (file)
--- a/xscsize.c
+++ b/xscsize.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: xscsize.c,v 1.3 1998/12/11 09:50:05 mdw Exp $
+ * $Id: xscsize.c,v 1.5 2002/01/13 14:44:03 mdw Exp $
  *
  * Return X display size to shell script
  *
@@ -29,6 +29,12 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: xscsize.c,v $
+ * Revision 1.5  2002/01/13 14:44:03  mdw
+ * Make flags be unsigned.
+ *
+ * Revision 1.4  1999/08/20 07:31:00  mdw
+ * Use new `mdwopt' flags in options table.
+ *
  * Revision 1.3  1998/12/11 09:50:05  mdw
  * Minor modifications to work with mLib and mgLib.
  *
@@ -70,12 +76,10 @@ int main(int argc, char *argv[])
   unsigned f = 0;
   unsigned long wd, ht;
 
-  enum {
-    f_sh = 1,
-    f_csh = 2,
-    f_shell = 3,
-    f_export = 4
-  };
+#define f_sh 1u
+#define f_csh 2u
+#define f_shell 3u
+#define f_export 4u
 
   /* --- Parse command line options --- */
 
@@ -83,14 +87,14 @@ int main(int argc, char *argv[])
 
   for (;;) {
     static struct option opt[] = {
-      { "help",        0,                      0,      'h' },
-      { "usage",       0,                      0,      'u' },
-      { "version",     0,                      0,      'v' },
-      { "display",     required_argument,      0,      'd' },
-      { "bourne-shell",        0,                      0,      'b' },
-      { "c-shell",     0,                      0,      'c' },
-      { "export",      0,                      0,      'x' },
-      {        0,              0,                      0,      0 }
+      { "help",        0,              0,      'h' },
+      { "usage",       0,              0,      'u' },
+      { "version",     0,              0,      'v' },
+      { "display",     OPTF_ARGREQ,    0,      'd' },
+      { "bourne-shell",        0,              0,      'b' },
+      { "c-shell",     0,              0,      'c' },
+      { "export",      0,              0,      'x' },
+      {        0,              0,              0,      0 }
     };
 
     int i = getopt_long(argc, argv, "huv d:bcx", opt, 0);