Makefile.pre.in: add $(OPT) to link command

audioop.c: fix for MPW
config.c.in: save original argc/argv for Lance
rotormodule.c: new coding conventions
timemodule.c: add casts for Lance

Modules/Makefile.pre.in

@@ -66,7 +66,7 @@ $(LIB):		$(OBJS)
 		$(RANLIB) $(LIB)
 
 ../python:	config.o $(MYLIBS)
-		$(CC) config.o \
+		$(CC) $(OPT) config.o \
 		      $(MYLIBS) $(MODLIBS) $(LIBS) $(SYSLIBS) -o python
 		mv python ../python
 

Modules/audioop.c

@@ -27,11 +27,13 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "allobjects.h"
 #include "modsupport.h"
 
-#if defined(__CHAR_UNSIGNED__) && defined(signed)
+#if defined(__CHAR_UNSIGNED__)
+#if defined(signed)
 !ERROR!; READ THE SOURCE FILE!;
 /* This module currently does not work on systems where only unsigned
    characters are available.  Take it out of Setup.  Sorry. */
 #endif
+#endif
 
 #include <math.h>
 

Modules/config.c.in

@@ -53,10 +53,18 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 static char *argv0;
 
+/* These are made available for other modules that might need them.
+   This is rare, but it is needed by the secureware module. */
+
+static char **orig_argv;
+static int  orig_argc;
+
 main(argc, argv)
 	int argc;
 	char **argv;
 {
+	orig_argc = argc;
+	orig_argv = argv;
 	argv0 = argv[0];
 	realmain(argc, argv);
 }
@@ -67,6 +75,15 @@ getprogramname()
 	return argv0;
 }
 
+void
+getargcargv(argc,argv)
+	int *argc;
+	char ***argv;
+{
+	*argc = orig_argc;
+	*argv = orig_argv;
+}
+
 #endif
 
 

Modules/timemodule.c

@@ -305,7 +305,7 @@ floattime()
 #ifdef HAVE_FTIME
 	struct timeb t;
 	ftime(&t);
-	return (double)t.time + t.millitm*0.001;
+	return (double)t.time + (double)t.millitm * (double)0.001;
 #else /* !HAVE_FTIME */
 	time_t secs;
 	time(&secs);