[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61420] trunk/lib/windows_vc12: Update to python 3.4.1, win32 msvc 2013
Martijn Berger
martijn.berger at gmail.com
Fri Aug 29 15:51:48 CEST 2014
Revision: 61420
https://developer.blender.org/rBL61420
Author: juicyfruit
Date: 2014-08-29 13:51:47 +0000 (Fri, 29 Aug 2014)
Log Message:
-----------
Update to python 3.4.1, win32 msvc 2013
Workaround -> http://bugs.python.org/issue17797
workaround / fix T40907
Modified Paths:
--------------
trunk/lib/windows_vc12/python/include/python3.4/abstract.h
trunk/lib/windows_vc12/python/include/python3.4/objimpl.h
trunk/lib/windows_vc12/python/include/python3.4/patchlevel.h
trunk/lib/windows_vc12/python/include/python3.4/pytime.h
trunk/lib/windows_vc12/python/include/python3.4/unicodeobject.h
trunk/lib/windows_vc12/python/lib/python34.dll
trunk/lib/windows_vc12/python/lib/python34.exp
trunk/lib/windows_vc12/python/lib/python34.lib
trunk/lib/windows_vc12/python/lib/python34_d.dll
trunk/lib/windows_vc12/python/lib/python34_d.exp
trunk/lib/windows_vc12/python/lib/python34_d.lib
trunk/lib/windows_vc12/python/lib/python34_d.pdb
trunk/lib/windows_vc12/release/python34.tar.gz
trunk/lib/windows_vc12/release/python34_d.tar.gz
Removed Paths:
-------------
trunk/lib/windows_vc12/python/include/python3.3/
trunk/lib/windows_vc12/python/lib/python33.dll
trunk/lib/windows_vc12/python/lib/python33.exp
trunk/lib/windows_vc12/python/lib/python33.lib
trunk/lib/windows_vc12/python/lib/python33_d.dll
trunk/lib/windows_vc12/python/lib/python33_d.exp
trunk/lib/windows_vc12/python/lib/python33_d.lib
trunk/lib/windows_vc12/python/lib/python33_d.pdb
trunk/lib/windows_vc12/release/python33.tar.gz
trunk/lib/windows_vc12/release/python33_d.tar.gz
trunk/lib/windows_vc12/release/python33_numpy_1.8.tar.gz
Modified: trunk/lib/windows_vc12/python/include/python3.4/abstract.h
===================================================================
--- trunk/lib/windows_vc12/python/include/python3.4/abstract.h 2014-08-29 12:13:33 UTC (rev 61419)
+++ trunk/lib/windows_vc12/python/include/python3.4/abstract.h 2014-08-29 13:51:47 UTC (rev 61420)
@@ -1021,7 +1021,7 @@
PyAPI_FUNC(PyObject *) PySequence_Fast(PyObject *o, const char* m);
/*
- Returns the sequence, o, as a list, unless it's already a
+ Return the sequence, o, as a list, unless it's already a
tuple or list. Use PySequence_Fast_GET_ITEM to access the
members of this list, and PySequence_Fast_GET_SIZE to get its length.
Modified: trunk/lib/windows_vc12/python/include/python3.4/objimpl.h
===================================================================
--- trunk/lib/windows_vc12/python/include/python3.4/objimpl.h 2014-08-29 12:13:33 UTC (rev 61419)
+++ trunk/lib/windows_vc12/python/include/python3.4/objimpl.h 2014-08-29 13:51:47 UTC (rev 61420)
@@ -265,7 +265,7 @@
#define _PyGCHead_REFS(g) ((g)->gc.gc_refs >> _PyGC_REFS_SHIFT)
#define _PyGCHead_SET_REFS(g, v) do { \
(g)->gc.gc_refs = ((g)->gc.gc_refs & ~_PyGC_REFS_MASK) \
- | (v << _PyGC_REFS_SHIFT); \
+ | (((size_t)(v)) << _PyGC_REFS_SHIFT); \
} while (0)
#define _PyGCHead_DECREF(g) ((g)->gc.gc_refs -= 1 << _PyGC_REFS_SHIFT)
Modified: trunk/lib/windows_vc12/python/include/python3.4/patchlevel.h
===================================================================
--- trunk/lib/windows_vc12/python/include/python3.4/patchlevel.h 2014-08-29 12:13:33 UTC (rev 61419)
+++ trunk/lib/windows_vc12/python/include/python3.4/patchlevel.h 2014-08-29 13:51:47 UTC (rev 61420)
@@ -18,12 +18,12 @@
/*--start constants--*/
#define PY_MAJOR_VERSION 3
#define PY_MINOR_VERSION 4
-#define PY_MICRO_VERSION 0
+#define PY_MICRO_VERSION 1
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL
#define PY_RELEASE_SERIAL 0
/* Version as a string */
-#define PY_VERSION "3.4.0"
+#define PY_VERSION "3.4.1"
/*--end constants--*/
/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
Modified: trunk/lib/windows_vc12/python/include/python3.4/pytime.h
===================================================================
--- trunk/lib/windows_vc12/python/include/python3.4/pytime.h 2014-08-29 12:13:33 UTC (rev 61419)
+++ trunk/lib/windows_vc12/python/include/python3.4/pytime.h 2014-08-29 13:51:47 UTC (rev 61420)
@@ -53,10 +53,19 @@
(tv_end.tv_usec - tv_start.tv_usec) * 0.000001)
#ifndef Py_LIMITED_API
+
+typedef enum {
+ /* Round towards zero. */
+ _PyTime_ROUND_DOWN=0,
+ /* Round away from zero. */
+ _PyTime_ROUND_UP
+} _PyTime_round_t;
+
/* Convert a number of seconds, int or float, to time_t. */
PyAPI_FUNC(int) _PyTime_ObjectToTime_t(
PyObject *obj,
- time_t *sec);
+ time_t *sec,
+ _PyTime_round_t);
/* Convert a time_t to a PyLong. */
PyAPI_FUNC(PyObject *) _PyLong_FromTime_t(
@@ -72,7 +81,8 @@
PyAPI_FUNC(int) _PyTime_ObjectToTimeval(
PyObject *obj,
time_t *sec,
- long *usec);
+ long *usec,
+ _PyTime_round_t);
/* Convert a number of seconds, int or float, to a timespec structure.
nsec is in the range [0; 999999999] and rounded towards zero.
@@ -80,7 +90,8 @@
PyAPI_FUNC(int) _PyTime_ObjectToTimespec(
PyObject *obj,
time_t *sec,
- long *nsec);
+ long *nsec,
+ _PyTime_round_t);
#endif
/* Dummy to force linking. */
Modified: trunk/lib/windows_vc12/python/include/python3.4/unicodeobject.h
===================================================================
--- trunk/lib/windows_vc12/python/include/python3.4/unicodeobject.h 2014-08-29 12:13:33 UTC (rev 61419)
+++ trunk/lib/windows_vc12/python/include/python3.4/unicodeobject.h 2014-08-29 13:51:47 UTC (rev 61420)
@@ -343,6 +343,9 @@
the data pointer is filled out. The bit is redundant, and helps
to minimize the test in PyUnicode_IS_READY(). */
unsigned int ready:1;
+ /* Padding to ensure that PyUnicode_DATA() is always aligned to
+ 4 bytes (see issue #19537 on m68k). */
+ unsigned int :24;
} state;
wchar_t *wstr; /* wchar_t representation (null-terminated) */
} PyASCIIObject;
Deleted: trunk/lib/windows_vc12/python/lib/python33.dll
===================================================================
(Binary files differ)
Deleted: trunk/lib/windows_vc12/python/lib/python33.exp
===================================================================
(Binary files differ)
Deleted: trunk/lib/windows_vc12/python/lib/python33.lib
===================================================================
(Binary files differ)
Deleted: trunk/lib/windows_vc12/python/lib/python33_d.dll
===================================================================
(Binary files differ)
Deleted: trunk/lib/windows_vc12/python/lib/python33_d.exp
===================================================================
(Binary files differ)
Deleted: trunk/lib/windows_vc12/python/lib/python33_d.lib
===================================================================
(Binary files differ)
Deleted: trunk/lib/windows_vc12/python/lib/python33_d.pdb
===================================================================
(Binary files differ)
Modified: trunk/lib/windows_vc12/python/lib/python34.dll
===================================================================
(Binary files differ)
Modified: trunk/lib/windows_vc12/python/lib/python34.exp
===================================================================
(Binary files differ)
Modified: trunk/lib/windows_vc12/python/lib/python34.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/windows_vc12/python/lib/python34_d.dll
===================================================================
(Binary files differ)
Modified: trunk/lib/windows_vc12/python/lib/python34_d.exp
===================================================================
(Binary files differ)
Modified: trunk/lib/windows_vc12/python/lib/python34_d.lib
===================================================================
(Binary files differ)
Modified: trunk/lib/windows_vc12/python/lib/python34_d.pdb
===================================================================
(Binary files differ)
Deleted: trunk/lib/windows_vc12/release/python33.tar.gz
===================================================================
(Binary files differ)
Deleted: trunk/lib/windows_vc12/release/python33_d.tar.gz
===================================================================
(Binary files differ)
Deleted: trunk/lib/windows_vc12/release/python33_numpy_1.8.tar.gz
===================================================================
(Binary files differ)
Modified: trunk/lib/windows_vc12/release/python34.tar.gz
===================================================================
(Binary files differ)
Modified: trunk/lib/windows_vc12/release/python34_d.tar.gz
===================================================================
(Binary files differ)
More information about the Bf-blender-cvs
mailing list