Subject: FVWM: [2.0.43] FvwmAudio patch

From: Mark Boyns <[email-masked]>
Date: 09 Jul 1996 09:09:12 -0700

Here's a patch which updates FvwmAudio to work with the new module
message M_STRING and fixes a problem with M_ERROR, rplay, and Solaris.
(Solaris also defines M_ERROR in one if its headers)

Please update the distribution with this patch.  Thanks.

*** FvwmAudio.c.orig	Wed May 17 05:55:00 1995
--- FvwmAudio.c	Tue Jul  9 08:54:47 1996
***************
*** 66,83 ****
  #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>
  #endif
  
  #define BUILTIN_STARTUP		MAX_MESSAGES
  #define BUILTIN_SHUTDOWN	MAX_MESSAGES+1
  #define BUILTIN_UNKNOWN		MAX_MESSAGES+2
--- 66,85 ----
  #include <unistd.h>
  #include <ctype.h>
  #include <stdlib.h>
  
  /*
   * rplay includes:
   */
  #ifdef HAVE_RPLAY
  #include <rplay.h>
+ #undef M_ERROR /* Solaris fix */
  #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
***************
*** 128,133 ****
--- 130,136 ----
  	"end_config_info",
  	"icon_file",
  	"default_icon",
+ 	"string",
  /* add builtins here */
  	"startup",
  	"shutdown",

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