summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2003-03-21 02:02:02 (GMT)
committerTim Peters <tim.peters@gmail.com>2003-03-21 02:02:02 (GMT)
commit82d61956faa9a6a884ad9327f9f5d7337f3a9bcb (patch)
treee06616af0d52bd1609df5fbac8da184e14ddbf80
parent0d7ce4e2215ad5b168fa9db046401ed6b379f253 (diff)
downloadcpython-82d61956faa9a6a884ad9327f9f5d7337f3a9bcb.zip
cpython-82d61956faa9a6a884ad9327f9f5d7337f3a9bcb.tar.gz
cpython-82d61956faa9a6a884ad9327f9f5d7337f3a9bcb.tar.bz2
Changed the DLL base-address assignment for _csv so it no longer
obviously overlaps w/ datetime (but may -- no time for more here now).
-rw-r--r--PC/dllbase_nt.txt2
-rw-r--r--PCbuild/_csv.dsp4
2 files changed, 3 insertions, 3 deletions
diff --git a/PC/dllbase_nt.txt b/PC/dllbase_nt.txt
index fdfe166..44609ea 100644
--- a/PC/dllbase_nt.txt
+++ b/PC/dllbase_nt.txt
@@ -32,7 +32,7 @@ More standard extensions 1D100000 - 1e000000
- winsound 1D160000 - 1D170000
- bZ2 1D170000 - 1D180000
- datetime 1D180000 - 1D190000
- - _csv 1D180000 - 1D1A0000
+ - _csv 1D190000 - 1D1A0000
Other extension modules
- win32api 1e200000 - 1e220000
diff --git a/PCbuild/_csv.dsp b/PCbuild/_csv.dsp
index 51d3073..ab6550d 100644
--- a/PCbuild/_csv.dsp
+++ b/PCbuild/_csv.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1d180000" /subsystem:windows /dll /debug /machine:I386 /out:"./_csv.pyd"
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1d190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_csv.pyd"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "_csv - Win32 Debug"
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1d180000" /subsystem:windows /dll /debug /machine:I386 /out:"./_csv_d.pyd" /pdbtype:sept
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1d190000" /subsystem:windows /dll /debug /machine:I386 /out:"./_csv_d.pyd" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ENDIF