summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2007-11-12 05:14:05 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2007-11-12 05:14:05 (GMT)
commit63bf149a264a246f109683d6ac54f84859a89660 (patch)
treeb4aabf6cabd425241282eb25726079a37544ab82
parentf354894e7b35b09dabacdbcb1b812b290b0457a2 (diff)
downloadcpython-63bf149a264a246f109683d6ac54f84859a89660.zip
cpython-63bf149a264a246f109683d6ac54f84859a89660.tar.gz
cpython-63bf149a264a246f109683d6ac54f84859a89660.tar.bz2
Patch #1418: Make the AC_REPLACE_FUNCS object files actually work.
-rw-r--r--Makefile.pre.in3
-rw-r--r--Misc/NEWS2
-rw-r--r--Python/hypot.c3
3 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 7dfa738..aac765b 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -169,6 +169,8 @@ THREADOBJ= @THREADOBJ@
DLINCLDIR= @DLINCLDIR@
DYNLOADFILE= @DYNLOADFILE@
MACHDEP_OBJS= @MACHDEP_OBJS@
+LIBOBJDIR= Python/
+LIBOBJS= @LIBOBJS@
UNICODE_OBJS= @UNICODE_OBJS@
PYTHON= python$(EXE)
@@ -275,6 +277,7 @@ PYTHON_OBJS= \
Python/getopt.o \
Python/pystrtod.o \
Python/$(DYNLOADFILE) \
+ $(LIBOBJS) \
$(MACHDEP_OBJS) \
$(THREADOBJ)
diff --git a/Misc/NEWS b/Misc/NEWS
index 17b7833..dfc5256 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1047,6 +1047,8 @@ Tools/Demos
Build
-----
+- Patch #1418: Make the AC_REPLACE_FUNCS object files actually work.
+
- Add a FAST_LOOPS build option that speeds-up looping by trading away
periodic threadstate and signal checking in tight loops. By default,
this option is turned-off. It should only be enabled in debugged,
diff --git a/Python/hypot.c b/Python/hypot.c
index 755d0c3..9d3c0d0 100644
--- a/Python/hypot.c
+++ b/Python/hypot.c
@@ -1,7 +1,6 @@
/* hypot() replacement */
-#include "pyconfig.h"
-#include "pyport.h"
+#include "Python.h"
double hypot(double x, double y)
{