[Python-checkins] cpython (2.7): remove (hilarious) defaults for various constants getpath.c needs

benjamin.peterson python-checkins at python.org
Thu Jun 2 15:45:03 EDT 2016


https://hg.python.org/cpython/rev/9533f28a9058
changeset:   101611:9533f28a9058
branch:      2.7
parent:      101607:97b76fe183f4
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Jun 02 12:41:35 2016 -0700
summary:
  remove (hilarious) defaults for various constants getpath.c needs

files:
  Modules/getpath.c |  25 ++-----------------------
  1 files changed, 2 insertions(+), 23 deletions(-)


diff --git a/Modules/getpath.c b/Modules/getpath.c
--- a/Modules/getpath.c
+++ b/Modules/getpath.c
@@ -96,29 +96,8 @@
 #endif
 
 
-#ifndef VERSION
-#define VERSION "2.1"
-#endif
-
-#ifndef VPATH
-#define VPATH "."
-#endif
-
-#ifndef PREFIX
-#  ifdef __VMS
-#    define PREFIX ""
-#  else
-#    define PREFIX "/usr/local"
-#  endif
-#endif
-
-#ifndef EXEC_PREFIX
-#define EXEC_PREFIX PREFIX
-#endif
-
-#ifndef PYTHONPATH
-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
-              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
+#if !defined(PREFIX) || !defined(EXEC_PREFIX) || !defined(VERSION) || !defined(VPATH)
+#error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined"
 #endif
 
 #ifndef LANDMARK

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list