Skip to content

Commit 7b1e974

Browse files
gvanrossumgvanrossum
committed
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
1 parent 0e3da7b commit 7b1e974

5 files changed

Lines changed: 128 additions & 105 deletions

File tree

‎Modules/Makefile.pre.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ $(LIB): $(OBJS)
6666
$(RANLIB) $(LIB)
6767

6868
../python: config.o $(MYLIBS)
69-
$(CC) config.o \
69+
$(CC) $(OPT) config.o \
7070
$(MYLIBS) $(MODLIBS) $(LIBS) $(SYSLIBS) -o python
7171
mv python ../python
7272

‎Modules/audioop.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
2727
#include "allobjects.h"
2828
#include "modsupport.h"
2929

30-
#if defined(__CHAR_UNSIGNED__) && defined(signed)
30+
#if defined(__CHAR_UNSIGNED__)
31+
#if defined(signed)
3132
!ERROR!; READ THE SOURCE FILE!;
3233
/* This module currently does not work on systems where only unsigned
3334
characters are available. Take it out of Setup. Sorry. */
3435
#endif
36+
#endif
3537

3638
#include <math.h>
3739

‎Modules/config.c.in‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,18 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
5353

5454
static char *argv0;
5555

56+
/* These are made available for other modules that might need them.
57+
This is rare, but it is needed by the secureware module. */
58+
59+
static char **orig_argv;
60+
static int orig_argc;
61+
5662
main(argc, argv)
5763
int argc;
5864
char **argv;
5965
{
66+
orig_argc = argc;
67+
orig_argv = argv;
6068
argv0 = argv[0];
6169
realmain(argc, argv);
6270
}
@@ -67,6 +75,15 @@ getprogramname()
6775
return argv0;
6876
}
6977

78+
void
79+
getargcargv(argc,argv)
80+
int *argc;
81+
char ***argv;
82+
{
83+
*argc = orig_argc;
84+
*argv = orig_argv;
85+
}
86+
7087
#endif
7188

7289

0 commit comments

Comments
 (0)