Subject: [2.0.44-almost] fixit patch

From: Makoto MATSUSHITA <[email-masked]>
Date: Wed, 08 Jan 1997 03:50:39 +0900

This is a summary patch I've made, to compile 2.0.44-almost properly
(CAUTION: My patches posted before is also included).

This patch fixes:

	* libs/Parse.c needs <ctype.h>, because it uses is*() macro.
	  is*() macro may be ONLY defined by macro (i.e. not in libc).
	* Portability fix of FvwmAudio, for Solaris. This is already
	  reported to [email-masked] (by the Author of FvwmAudio:),
	  Message-Id: <[email-masked]>.
	* FvwmAudio doesn't know new module command 'mini_icon'.
	* Manual typo in FvwmForm, '.B' macro takes maximum 6 argument
	  but manual uses 7. This is already reported to [email-masked],
	  Message-Id: <[email-masked]>.
	* FvwmIconMan forces to use sysconf(). Use GetFdWidth()
	  defined in fvwm library (libs/System.c).

I hope it'll be included to 2.0.44...

--- libs/Parse.c.dist	Thu Dec 12 07:23:34 1996
+++ libs/Parse.c	Wed Jan  8 03:31:47 1997
@@ -4,6 +4,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <ctype.h>
 #include "fvwmlib.h"
 
 /*
--- modules/FvwmAudio/FvwmAudio.c.dist	Wed Sep 18 22:12:58 1996
+++ modules/FvwmAudio/FvwmAudio.c	Wed Jan  8 03:37:56 1997
@@ -66,18 +66,20 @@
 #include <unistd.h>
 #include <ctype.h>
 #include <stdlib.h>
-#include "../../configure.h"
-#include "../../fvwm/module.h"
-#include "../../version.h"
-#include "../../libs/fvwmlib.h"     
 
 /*
  * rplay includes:
  */
 #ifdef HAVE_RPLAY
 #include <rplay.h>
+#undef M_ERROR
 #endif
 
+#include "../../configure.h"
+#include "../../fvwm/module.h"
+#include "../../version.h"
+#include "../../libs/fvwmlib.h"     
+
 #define BUILTIN_STARTUP		MAX_MESSAGES
 #define BUILTIN_SHUTDOWN	MAX_MESSAGES+1
 #define BUILTIN_UNKNOWN		MAX_MESSAGES+2
@@ -129,6 +131,7 @@
 	"icon_file",
 	"default_icon",
         "string",
+        "mini_icon",
 /* add builtins here */
 	"startup",
 	"shutdown",
--- modules/FvwmForm/FvwmForm.man.dist	Wed Sep 27 03:14:57 1995
+++ modules/FvwmForm/FvwmForm.man	Wed Jan  8 03:35:48 1997
@@ -145,7 +145,7 @@
 .B \fImultiple\fP
 This is a multiple-choice selection.
 .TP 4
-.B *FvwmFormChoice \fIname\fP \fIvalue\fP on | off "\fIstring\fP"
+.B *FvwmFormChoice \fIname\fP \fIvalue\fP "on | off" "\fIstring\fP"
 Specifies a choice for a selection.
 The choice item has a \fIname\fP and a \fIvalue\fP.
 The \fIstring\fP will be displayed to the right of the choice button
--- modules/FvwmIconMan/FvwmIconMan.c.dist	Thu Oct 17 03:12:09 1996
+++ modules/FvwmIconMan/FvwmIconMan.c	Wed Jan  8 03:31:48 1997
@@ -6,6 +6,7 @@
 #else
 #include "../../fvwm/module.h"
 #endif
+#include "../../libs/fvwmlib.h"
 
 static int fd_width;
 static FILE *console = NULL;
@@ -211,7 +212,7 @@
   read_in_resources (argv[3]);
   
   assert (globals.managers);
-  fd_width = sysconf(_SC_OPEN_MAX);
+  fd_width = GetFdWidth();
 
   SetMessageMask(Fvwm_fd,M_CONFIGURE_WINDOW | M_RES_CLASS | M_RES_NAME |
                  M_ADD_WINDOW | M_DESTROY_WINDOW | M_ICON_NAME |

-- -
Makoto `MAR_kun' MATSUSHITA
--
Visit the official FVWM web page at <URL:http://www.hpc.uh.edu/fvwm/>.
To unsubscribe from the list, send "unsubscribe fvwm-workers" in the
body of a message to [email-masked].
To report problems, send mail to [email-masked].