*** gwm/Imakefile	Fri Aug 28 12:57:32 1992
--- gwm.new/Imakefile	Sun Dec 13 16:16:36 1992
***************
*** 5,12 ****
  
  # Configuration parameters:
  /* comment out  if you don't have installed libXpm.a with the rest of X */
! #define UseInstalledXpm Yes
  
  # ----- end of configuration parameters, do not edit below -----
  
  #if defined (UseInstalledXpm)
--- 5,14 ----
  
  # Configuration parameters:
  /* comment out  if you don't have installed libXpm.a with the rest of X */
! /* #define UseInstalledXpm Yes */
  
+ /* CONFIGDEFS=-Dbison */
+ 
  # ----- end of configuration parameters, do not edit below -----
  
  #if defined (UseInstalledXpm)
***************
*** 59,64 ****
--- 61,69 ----
  #ifdef sequent
  EXTRA_LIBRARIES = -lseq
  #endif
+ #if LEX == flex
+ EXTRA_LIBRARIES = -lfl
+ #endif
  
  LOCAL_LIBRARIES = $(XPMLIB)
  SYS_LIBRARIES   = $(EXTENSIONLIB) $(XLIB)
***************
*** 72,78 ****
  	wl_menu.c wl_name.c wl_number.c wl_pixmap.c wl_plug.c \
  	wl_pointer.c wl_string.c wob.c wool-gwm.c wool.c wops.c 
  
! OTHERSRCS = wool.yac wool.lex
  
  OBJS = 	y.tab.o \
   	bar.o client.o error.o gwm.o icccm.o machine.o malloc.o \
--- 77,83 ----
  	wl_menu.c wl_name.c wl_number.c wl_pixmap.c wl_plug.c \
  	wl_pointer.c wl_string.c wob.c wool-gwm.c wool.c wops.c 
  
! OTHERSRCS = wool.yac wool.flex
  
  OBJS = 	y.tab.o \
   	bar.o client.o error.o gwm.o icccm.o machine.o malloc.o \
***************
*** 88,95 ****
  
  depend:: lex.yy.c y.tab.c
  
! lex.yy.c: wool.lex
! 	lex wool.lex
  
  y.tab.c: wool.yac 
  	yacc wool.yac
--- 93,100 ----
  
  depend:: lex.yy.c y.tab.c
  
! lex.yy.c: wool.flex
! 	flex wool.flex
  
  y.tab.c: wool.yac 
  	yacc wool.yac
*** gwm/gwm.c	Fri Aug 28 12:57:33 1992
--- gwm.new/gwm.c	Sun Dec 13 05:19:05 1992
***************
*** 457,465 ****
--- 457,469 ----
      signal(SIGTERM, GWM_end);
      signal(SIGFPE, GWM_FatalSignalHandler);
      signal(SIGILL, GWM_BusErrorSignalHandler);
+ #ifdef SIGBUS
      signal(SIGBUS, GWM_BusErrorSignalHandler);
+ #endif
      signal(SIGSEGV, GWM_BusErrorSignalHandler);
+ #ifdef SIGSYS
      signal(SIGSYS, GWM_FatalSignalHandler);
+ #endif
  #endif /* DEBUG     */
  }
  
diff -C 3 gwm/malloc.c gwm.new/malloc.c
*** gwm/malloc.c	Fri Aug 28 12:57:36 1992
--- gwm.new/malloc.c	Sun Dec 13 12:25:40 1992
***************
*** 58,67 ****
  #define	NULL 0
  #endif
  #include <sys/types.h>
! #if defined(i386) && !defined(sequent) && !defined(SCO)
  typedef unsigned char	u_char;
  typedef unsigned int	u_int;
  #endif /* i386 */
  #include "wool.h"
  
  #ifdef STANDARD_MALLOC
--- 58,72 ----
  #define	NULL 0
  #endif
  #include <sys/types.h>
! #if defined(i386) && !defined(sequent) && !defined(SCO) && !defined(linux)
  typedef unsigned char	u_char;
  typedef unsigned int	u_int;
  #endif /* i386 */
+ #ifndef __GNUC__
+ #define MALLOC_TYPE char *
+ #else
+ #define MALLOC_TYPE void *
+ #endif
  #include "wool.h"
  
  #ifdef STANDARD_MALLOC
***************
*** 275,281 ****
   * for accounting.
   */
  
! char           *
  REAL_malloc(nbytes)
  unsigned        nbytes;
  {
--- 280,286 ----
   * for accounting.
   */
  
! MALLOC_TYPE
  REAL_malloc(nbytes)
  unsigned        nbytes;
  {
***************
*** 479,485 ****
   * can be handled NULL pointer, but not 0 size...
   */
  
! char           *
  REAL_realloc(cp, nbytes)
  char           *cp;
  unsigned        nbytes;
--- 484,490 ----
   * can be handled NULL pointer, but not 0 size...
   */
  
! MALLOC_TYPE
  REAL_realloc(cp, nbytes)
  char           *cp;
  unsigned        nbytes;
***************
*** 525,531 ****
      }
  }
  
! char *
  REAL_calloc(nelem, elsize)
  unsigned nelem, elsize;
  {
--- 530,536 ----
      }
  }
  
! MALLOC_TYPE
  REAL_calloc(nelem, elsize)
  unsigned nelem, elsize;
  {
diff -C 3 gwm/wool.c gwm.new/wool.c
*** gwm/wool.c	Fri Aug 28 12:57:43 1992
--- gwm.new/wool.c	Sun Dec 13 17:54:39 1992
***************
*** 13,18 ****
--- 13,20 ----
  * 	- add it to the declaration of predefined functions    *
  * 	  in the wool_init function			       *
  * 							       *
+ * Kludged badly to support the flex skeleton parser for V2.3.7 *
+ *				Dec 1992, O. Kirch	       *
  \**************************************************************/
  
  #include <stdio.h>
***************
*** 1039,1045 ****
  
  /* signals management avoiding defunct processes */
  
! #ifdef SYSV
  void
  ChildDeathHandler(sig)
  int sig;
--- 1041,1047 ----
  
  /* signals management avoiding defunct processes */
  
! #if defined SYSV || defined linux
  void
  ChildDeathHandler(sig)
  int sig;
***************
*** 1060,1065 ****
--- 1062,1068 ----
  int sig;
  {
      union wait status;
+ 
      wait3(&status, WNOHANG, 0);
      signal(SIGCHLD, ChildDeathHandler);
  }
*** gwm/wool.h	Fri Aug 28 12:57:43 1992
--- gwm.new/wool.h	Sun Dec 13 05:11:11 1992
***************
*** 193,199 ****
--- 193,203 ----
  #define Free(bytes) free(bytes)
  #define Realloc(ptr, bytes) realloc(ptr, bytes)
  #define Calloc(ptr, bytes) calloc(ptr, bytes)
+ #ifdef __GNUC__
+ extern void *malloc(), *realloc(), *calloc();
+ #else
  extern char *malloc(), *realloc(), *calloc();
+ #endif
  #else /* DO_NOT_REDEFINE_MALLOC */
  #define Malloc(bytes) wool_malloc(bytes)
  #define Free(bytes) wool_free(bytes)
