--- gpm-1.19.6/src/gpm.c	Mon Oct  1 22:02:25 2001
+++ gpm-1.19.6.new2/src/gpm.c	Sun Feb 10 14:54:30 2002
@@ -27,6 +27,7 @@
 #include <errno.h>
 #include <unistd.h>        /* select(); */
 #include <signal.h>        /* SIGPIPE */
+#include <time.h>          /* time() */
 #include <sys/param.h>
 #include <sys/fcntl.h>     /* O_RDONLY */
 #include <sys/wait.h>      /* wait()   */
--- gpm-1.19.6/src/synaptics.c	Sun Sep 23 21:00:03 2001
+++ gpm-1.19.6.new2/src/synaptics.c	Sun Feb 10 15:02:33 2002
@@ -212,43 +212,43 @@
 
 static param_data_type param_data [] = {
   /* enabling configuration parameters */
-  { "edge_motion_enabled",        Flag_Param,    &edge_motion_enabled        },
-  { "edge_motion_speed_enabled",  Flag_Param,    &edge_motion_speed_enabled  },
-  { "corner_taps_enabled",        Flag_Param,    &corner_taps_enabled        },
-  { "taps_enabled",               Flag_Param,    &taps_enabled               },
-  { "pressure_speed_enabled",     Flag_Param,    &pressure_speed_enabled     },
-  { "tossing_enabled",            Flag_Param,    &tossing_enabled            },
-  { "does_toss_use_static_speed", Flag_Param,    &does_toss_use_static_speed },
+  { "edge_motion_enabled",        Flag_Param,    {&edge_motion_enabled}      },
+  { "edge_motion_speed_enabled",  Flag_Param,    {&edge_motion_speed_enabled}},
+  { "corner_taps_enabled",        Flag_Param,    {&corner_taps_enabled}      },
+  { "taps_enabled",               Flag_Param,    {&taps_enabled}             },
+  { "pressure_speed_enabled",     Flag_Param,    {&pressure_speed_enabled}   },
+  { "tossing_enabled",            Flag_Param,    {&tossing_enabled}          },
+  { "does_toss_use_static_speed", Flag_Param,    {&does_toss_use_static_speed}},
   /* pressure induced speed related configuration parameters */
-  { "low_pressure",               Integer_Param, &low_pressure               },
-  { "speed_up_pressure",          Integer_Param, &speed_up_pressure          },
-  { "pressure_factor",            Float_Param,   &pressure_factor            },
-  { "standard_speed_factor",      Float_Param,   &standard_speed_factor      },
+  { "low_pressure",               Integer_Param, {&low_pressure}             },
+  { "speed_up_pressure",          Integer_Param, {&speed_up_pressure}        },
+  { "pressure_factor",            Float_Param,   {&pressure_factor}          },
+  { "standard_speed_factor",      Float_Param,   {&standard_speed_factor}    },
   /* toss/catch related parameters */
-  { "min_toss_time",              Integer_Param, &min_toss_time              },
-  { "max_toss_time",              Integer_Param, &max_toss_time              },
-  { "toss_cleanup_time",          Integer_Param, &toss_cleanup_time          },
-  { "min_toss_dist",              Integer_Param, &min_toss_dist              },
-  { "static_toss_speed",          Integer_Param, &static_toss_speed          },
-  { "toss_speed_factor",          Float_Param,   &toss_speed_factor          },
+  { "min_toss_time",              Integer_Param, {&min_toss_time}            },
+  { "max_toss_time",              Integer_Param, {&max_toss_time}            },
+  { "toss_cleanup_time",          Integer_Param, {&toss_cleanup_time}        },
+  { "min_toss_dist",              Integer_Param, {&min_toss_dist}            },
+  { "static_toss_speed",          Integer_Param, {&static_toss_speed}        },
+  { "toss_speed_factor",          Float_Param,   {&toss_speed_factor}        },
   /* edge motion related configuration parameters */
-  { "edge_speed",                 Integer_Param, &edge_speed                 },
+  { "edge_speed",                 Integer_Param, {&edge_speed}               },
   /* corner tap actions */
-  { "upper_left_action",          Corner_Param,  &corner_actions [0]         },
-  { "lower_left_action",          Corner_Param,  &corner_actions [1]         },
-  { "upper_right_action",         Corner_Param,  &corner_actions [2]         },
-  { "lower_right_action",         Corner_Param,  &corner_actions [3]         },
+  { "upper_left_action",          Corner_Param,  {&corner_actions [0]}       },
+  { "lower_left_action",          Corner_Param,  {&corner_actions [1]}       },
+  { "upper_right_action",         Corner_Param,  {&corner_actions [2]}       },
+  { "lower_right_action",         Corner_Param,  {&corner_actions [3]}       },
   /* use wmode */
-  { "use_wmode",		  Flag_Param,	 &use_wmode		     },
-  { "finger_threshold",		  Integer_Param, &finger_threshold	     },
-  { "tap_lower_limit",		  Integer_Param, &tap_lower_limit	     },
-  { "tap_upper_limit",		  Integer_Param, &tap_upper_limit	     },
-  { "tap_range",		  Integer_Param, &tap_range		     },
-  { "tap_interval",		  Integer_Param, &tap_interval		     },
-  { "drag_lock",		  Flag_Param,	 &drag_lock		     },
-  { "multiple_click_delay",	  Integer_Param, &multiple_click_delay	     },
+  { "use_wmode",		  Flag_Param,	 {&use_wmode}		     },
+  { "finger_threshold",		  Integer_Param, {&finger_threshold}	     },
+  { "tap_lower_limit",		  Integer_Param, {&tap_lower_limit}	     },
+  { "tap_upper_limit",		  Integer_Param, {&tap_upper_limit}	     },
+  { "tap_range",		  Integer_Param, {&tap_range}		     },
+  { "tap_interval",		  Integer_Param, {&tap_interval}	     },
+  { "drag_lock",		  Flag_Param,	 {&drag_lock}		     },
+  { "multiple_click_delay",	  Integer_Param, {&multiple_click_delay}     },
   /* end of list */
-  { NULL,                         Flag_Param,    NULL                        }
+  { NULL,                         Flag_Param,    {NULL}                      }
 };
 
 
--- gpm-1.19.6/doc/mktxt	Sun Sep 23 21:00:03 2001
+++ gpm-1.19.6.new2/doc/mktxt	Sun Feb 10 15:31:28 2002
@@ -29,7 +29,7 @@
 NODELINE==5  { printf "\t\t\t\t"; NODELINE=0}
 
 
-/^* Menu:$/  { KEEP=0 }
+/^\* Menu:$/  { KEEP=0 }
 
 
 
