From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 1 Jan 2016 17:56:16 +0000 (-0600)
Subject: merge 3.4
X-Git-Tag: v3.6.0a1~833^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e3dd513966d7cc2e03d97832e2fe22108b31e39;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

4e3dd513966d7cc2e03d97832e2fe22108b31e39
diff --cc Modules/_collectionsmodule.c
index 4fffe01a84d8,6115c702a939..1a334285c166
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@@ -1,16 -1,8 +1,14 @@@
  #include "Python.h"
  #include "structmember.h"
  
 +#ifdef STDC_HEADERS
 +#include <stddef.h>
 +#else
 +#include <sys/types.h>          /* For size_t */
 +#endif
 +
  /* collections module implementation of a deque() datatype
     Written and maintained by Raymond D. Hettinger <python@rcn.com>
-    Copyright (c) 2004-2015 Python Software Foundation.
-    All rights reserved.
  */
  
  /* The block length may be set to any number over 1.  Larger numbers