X-Git-Url: https://git.distorted.org.uk/~mdw/xtoys/blobdiff_plain/f3b35b6bbd646fb0e676ef3d64c91b38ff9f9162..6672918df48a912fee1070b89d97e5e371cb8c6d:/xscsize.c

diff --git a/xscsize.c b/xscsize.c
index 93cac68..3d9d7ce 100644
--- a/xscsize.c
+++ b/xscsize.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: xscsize.c,v 1.2 1998/11/21 22:30:22 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,15 @@
 /*----- 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.
+ *
  * Revision 1.2  1998/11/21 22:30:22  mdw
  * Support GNU-style long options throughout, and introduce proper help
  * text to all programs.  Update manual pages to match.
@@ -46,8 +55,8 @@
 
 #include <X11/Xlib.h>
 
-#include "mdwopt.h"
-#include "quis.h"
+#include <mLib/mdwopt.h>
+#include <mLib/quis.h>
 
 /*----- Main code ---------------------------------------------------------*/
 
@@ -67,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 --- */
 
@@ -80,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);