87 lines
3.7 KiB
Diff
87 lines
3.7 KiB
Diff
diff --strip-trailing-cr -aur old/setup.py 001/setup.py
|
|
--- old/setup.py 2014-05-03 11:37:18.000000000 -0300
|
|
+++ 001/setup.py 2015-03-25 23:28:00.347036000 -0300
|
|
@@ -224,7 +224,7 @@
|
|
# languishing and will probably never be fixed for Python 2.6...
|
|
if sys.version_info > (2,6):
|
|
from distutils.spawn import spawn
|
|
- from distutils.msvc9compiler import MSVCCompiler
|
|
+ from distutils.msvccompiler import MSVCCompiler
|
|
MSVCCompiler._orig_spawn = MSVCCompiler.spawn
|
|
MSVCCompiler._orig_link = MSVCCompiler.link
|
|
|
|
@@ -293,7 +293,7 @@
|
|
MSVCCompiler.link = monkeypatched_link
|
|
|
|
|
|
-sdk_dir = find_platform_sdk_dir()
|
|
+sdk_dir = find_platform_sdk_dir() or ''
|
|
|
|
class WinExt (Extension):
|
|
# Base class for all win32 extensions, with some predefined
|
|
diff --strip-trailing-cr -aur old/win32/src/PySECURITY_DESCRIPTOR.cpp 001/win32/src/PySECURITY_DESCRIPTOR.cpp
|
|
--- old/win32/src/PySECURITY_DESCRIPTOR.cpp 2011-03-19 10:51:22.000000000 -0300
|
|
+++ 001/win32/src/PySECURITY_DESCRIPTOR.cpp 2015-03-25 23:35:09.176365400 -0300
|
|
@@ -5,6 +5,7 @@
|
|
#include "PyWinObjects.h"
|
|
#include "PySecurityObjects.h"
|
|
#include "structmember.h"
|
|
+#include <algorithm>
|
|
|
|
#ifndef NO_PYWINTYPES_SECURITY
|
|
BOOL (WINAPI *setsecuritydescriptorcontrol)(PSECURITY_DESCRIPTOR, SECURITY_DESCRIPTOR_CONTROL, SECURITY_DESCRIPTOR_CONTROL)=NULL;
|
|
@@ -786,7 +787,7 @@
|
|
{
|
|
ob_type = &PySECURITY_DESCRIPTORType;
|
|
_Py_NewReference(this);
|
|
- cb = max(cb, SECURITY_DESCRIPTOR_MIN_LENGTH);
|
|
+ cb = std::max((long long unsigned int)cb, SECURITY_DESCRIPTOR_MIN_LENGTH);
|
|
PSECURITY_DESCRIPTOR psd = malloc(cb);
|
|
this->m_psd=NULL;
|
|
if (::InitializeSecurityDescriptor(psd, SECURITY_DESCRIPTOR_REVISION))
|
|
diff --strip-trailing-cr -aur old/win32/src/PySecurityObjects.h 001/win32/src/PySecurityObjects.h
|
|
--- old/win32/src/PySecurityObjects.h 2011-03-19 10:51:22.000000000 -0300
|
|
+++ 001/win32/src/PySecurityObjects.h 2015-03-25 23:29:45.425492600 -0300
|
|
@@ -121,7 +121,7 @@
|
|
static PyObject *GetSubAuthorityCount(PyObject *self, PyObject *args);
|
|
static PyObject *GetSubAuthority(PyObject *self, PyObject *args);
|
|
static PyObject *GetSidIdentifierAuthority(PyObject *self, PyObject *args);
|
|
- static struct PyMethodDef PySID::methods[];
|
|
+ static struct PyMethodDef methods[];
|
|
|
|
protected:
|
|
PSID m_psid;
|
|
@@ -159,7 +159,7 @@
|
|
/* Python support */
|
|
int compare(PyObject *ob);
|
|
static void deallocFunc(PyObject *ob);
|
|
- static struct PyMethodDef PyACL::methods[];
|
|
+ static struct PyMethodDef methods[];
|
|
|
|
static PyObject *Initialize(PyObject *self, PyObject *args);
|
|
static PyObject *IsValid(PyObject *self, PyObject *args);
|
|
diff --strip-trailing-cr -aur old/win32/src/PyWinObjects.h 001/win32/src/PyWinObjects.h
|
|
--- old/win32/src/PyWinObjects.h 2011-03-19 10:51:22.000000000 -0300
|
|
+++ 001/win32/src/PyWinObjects.h 2015-03-25 23:29:25.800392400 -0300
|
|
@@ -52,7 +52,7 @@
|
|
PyObject *str();
|
|
PyObject *repr();
|
|
int compare(PyObject *ob);
|
|
- PyObject *PyTime::richcompare(PyObject *other, int op);
|
|
+ PyObject *richcompare(PyObject *other, int op);
|
|
|
|
int print(FILE *fp, int flags);
|
|
Py_hash_t hash(void);
|
|
diff --strip-trailing-cr -aur old/win32/src/PyWinTypesmodule.cpp 001/win32/src/PyWinTypesmodule.cpp
|
|
--- old/win32/src/PyWinTypesmodule.cpp 2012-09-24 10:17:36.000000000 -0300
|
|
+++ 001/win32/src/PyWinTypesmodule.cpp 2015-03-25 23:38:45.812576700 -0300
|
|
@@ -1139,7 +1139,7 @@
|
|
}
|
|
|
|
// Function to format a python traceback into a character string.
|
|
-#define GPEM_ERROR(what) {errorMsg = "<Error getting traceback - " ## what ## ">";goto done;}
|
|
+#define GPEM_ERROR(what) {errorMsg = "<Error getting traceback - " what ">";goto done;}
|
|
char *GetPythonTraceback(PyObject *exc_type, PyObject *exc_value, PyObject *exc_tb)
|
|
{
|
|
// Sleep (30000); // Time enough to attach the debugger (barely)
|