From 1c4dc75fabb34cac3c18d7aa0c0e9b74fd740cd9 Mon Sep 17 00:00:00 2001
From: Alex Clark <aclark@aclark.net>
Date: Mon, 17 Mar 2014 10:50:58 -0400
Subject: [PATCH] Avoid conflicting _expand functions in PIL & MINGW

fixes #538
---
 CHANGES.rst | 3 +++
 _imaging.c  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 2f9a50efe..bb4131151 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,9 @@ Changelog (Pillow)
 2.4.0 (unreleased)
 ------------------
 
+- Avoid conflicting _expand functions in PIL & MINGW, fixes #538
+  [aclark]
+
 - Merge from Philippe Lagadec’s OleFileIO_PL fork
   [vadmium]
 
diff --git a/_imaging.c b/_imaging.c
index f1a181b30..215c56bf6 100644
--- a/_imaging.c
+++ b/_imaging.c
@@ -846,7 +846,7 @@ _crop(ImagingObject* self, PyObject* args)
 }
 
 static PyObject*
-_expand(ImagingObject* self, PyObject* args)
+_expand_image(ImagingObject* self, PyObject* args)
 {
     int x, y;
     int mode = 0;
@@ -2996,7 +2996,7 @@ static struct PyMethodDef methods[] = {
     {"crackcode", (PyCFunction)_crackcode, 1},
 #endif
     {"crop", (PyCFunction)_crop, 1},
-    {"expand", (PyCFunction)_expand, 1},
+    {"expand", (PyCFunction)_expand_image, 1},
     {"filter", (PyCFunction)_filter, 1},
     {"histogram", (PyCFunction)_histogram, 1},
 #ifdef WITH_MODEFILTER