[Python-checkins] cpython (merge 3.6 -> default): merge 3.6

[benjamin.peterson]

https://hg.python.org/cpython/rev/307d7b47b06a
changeset:   104602:307d7b47b06a
parent:      104600:a9a136c9d857
parent:      104601:fd9a4bd16587
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Oct 20 22:39:39 2016 -0700
summary:
  merge 3.6

files:
  Include/pydtrace.h                 |  36 +++++++++---------
  Makefile.pre.in                    |   1 -
  PCbuild/pythoncore.vcxproj         |   1 -
  PCbuild/pythoncore.vcxproj.filters |   3 -
  Python/dtrace_stubs.c              |  24 ------------
  5 files changed, 18 insertions(+), 47 deletions(-)


diff --git a/Include/pydtrace.h b/Include/pydtrace.h
--- a/Include/pydtrace.h
+++ b/Include/pydtrace.h
@@ -25,25 +25,25 @@
 
 /* Without DTrace, compile to nothing. */
 
-inline void PyDTrace_LINE(const char *arg0, const char *arg1, int arg2) {}
-inline void PyDTrace_FUNCTION_ENTRY(const char *arg0, const char *arg1, int arg2)  {}
-inline void PyDTrace_FUNCTION_RETURN(const char *arg0, const char *arg1, int arg2) {}
-inline void PyDTrace_GC_START(int arg0) {}
-inline void PyDTrace_GC_DONE(int arg0) {}
-inline void PyDTrace_INSTANCE_NEW_START(int arg0) {}
-inline void PyDTrace_INSTANCE_NEW_DONE(int arg0) {}
-inline void PyDTrace_INSTANCE_DELETE_START(int arg0) {}
-inline void PyDTrace_INSTANCE_DELETE_DONE(int arg0) {}
+static inline void PyDTrace_LINE(const char *arg0, const char *arg1, int arg2) {}
+static inline void PyDTrace_FUNCTION_ENTRY(const char *arg0, const char *arg1, int arg2)  {}
+static inline void PyDTrace_FUNCTION_RETURN(const char *arg0, const char *arg1, int arg2) {}
+static inline void PyDTrace_GC_START(int arg0) {}
+static inline void PyDTrace_GC_DONE(int arg0) {}
+static inline void PyDTrace_INSTANCE_NEW_START(int arg0) {}
+static inline void PyDTrace_INSTANCE_NEW_DONE(int arg0) {}
+static inline void PyDTrace_INSTANCE_DELETE_START(int arg0) {}
+static inline void PyDTrace_INSTANCE_DELETE_DONE(int arg0) {}
 
-inline int PyDTrace_LINE_ENABLED(void) { return 0; }
-inline int PyDTrace_FUNCTION_ENTRY_ENABLED(void) { return 0; }
-inline int PyDTrace_FUNCTION_RETURN_ENABLED(void) { return 0; }
-inline int PyDTrace_GC_START_ENABLED(void) { return 0; }
-inline int PyDTrace_GC_DONE_ENABLED(void) { return 0; }
-inline int PyDTrace_INSTANCE_NEW_START_ENABLED(void) { return 0; }
-inline int PyDTrace_INSTANCE_NEW_DONE_ENABLED(void) { return 0; }
-inline int PyDTrace_INSTANCE_DELETE_START_ENABLED(void) { return 0; }
-inline int PyDTrace_INSTANCE_DELETE_DONE_ENABLED(void) { return 0; }
+static inline int PyDTrace_LINE_ENABLED(void) { return 0; }
+static inline int PyDTrace_FUNCTION_ENTRY_ENABLED(void) { return 0; }
+static inline int PyDTrace_FUNCTION_RETURN_ENABLED(void) { return 0; }
+static inline int PyDTrace_GC_START_ENABLED(void) { return 0; }
+static inline int PyDTrace_GC_DONE_ENABLED(void) { return 0; }
+static inline int PyDTrace_INSTANCE_NEW_START_ENABLED(void) { return 0; }
+static inline int PyDTrace_INSTANCE_NEW_DONE_ENABLED(void) { return 0; }
+static inline int PyDTrace_INSTANCE_DELETE_START_ENABLED(void) { return 0; }
+static inline int PyDTrace_INSTANCE_DELETE_DONE_ENABLED(void) { return 0; }
 
 #endif /* !WITH_DTRACE */
 
diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -355,7 +355,6 @@
 		Python/compile.o \
 		Python/codecs.o \
 		Python/dynamic_annotations.o \
-		Python/dtrace_stubs.o \
 		Python/errors.o \
 		Python/frozenmain.o \
 		Python/future.o \
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -356,7 +356,6 @@
     <ClCompile Include="..\Python\ceval.c" />
     <ClCompile Include="..\Python\codecs.c" />
     <ClCompile Include="..\Python\compile.c" />
-    <ClCompile Include="..\Python\dtrace_stubs.c" />
     <ClCompile Include="..\Python\dynamic_annotations.c" />
     <ClCompile Include="..\Python\dynload_win.c" />
     <ClCompile Include="..\Python\errors.c" />
diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
--- a/PCbuild/pythoncore.vcxproj.filters
+++ b/PCbuild/pythoncore.vcxproj.filters
@@ -851,9 +851,6 @@
     <ClCompile Include="..\Python\compile.c">
       <Filter>Python</Filter>
     </ClCompile>
-    <ClCompile Include="..\Python\dtrace_stubs.c">
-      <Filter>Python</Filter>
-    </ClCompile>
     <ClCompile Include="..\Python\dynamic_annotations.c">
       <Filter>Python</Filter>
     </ClCompile>
diff --git a/Python/dtrace_stubs.c b/Python/dtrace_stubs.c
deleted file mode 100644
--- a/Python/dtrace_stubs.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <Python.h>
-#include "pydtrace.h"
-
-#ifndef WITH_DTRACE
-extern inline void PyDTrace_LINE(const char *arg0, const char *arg1, int arg2);
-extern inline void PyDTrace_FUNCTION_ENTRY(const char *arg0, const char *arg1, int arg2);
-extern inline void PyDTrace_FUNCTION_RETURN(const char *arg0, const char *arg1, int arg2);
-extern inline void PyDTrace_GC_START(int arg0);
-extern inline void PyDTrace_GC_DONE(int arg0);
-extern inline void PyDTrace_INSTANCE_NEW_START(int arg0);
-extern inline void PyDTrace_INSTANCE_NEW_DONE(int arg0);
-extern inline void PyDTrace_INSTANCE_DELETE_START(int arg0);
-extern inline void PyDTrace_INSTANCE_DELETE_DONE(int arg0);
-
-extern inline int PyDTrace_LINE_ENABLED(void);
-extern inline int PyDTrace_FUNCTION_ENTRY_ENABLED(void);
-extern inline int PyDTrace_FUNCTION_RETURN_ENABLED(void);
-extern inline int PyDTrace_GC_START_ENABLED(void);
-extern inline int PyDTrace_GC_DONE_ENABLED(void);
-extern inline int PyDTrace_INSTANCE_NEW_START_ENABLED(void);
-extern inline int PyDTrace_INSTANCE_NEW_DONE_ENABLED(void);
-extern inline int PyDTrace_INSTANCE_DELETE_START_ENABLED(void);
-extern inline int PyDTrace_INSTANCE_DELETE_DONE_ENABLED(void);
-#endif

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