Merge branch 'marcusva-alloca'

2 files changed, 2 insertions, 31 deletions

diff --git a/windows/alloca.h b/windows/alloca.h
deleted file mode 100644
index 4d47e4aab..000000000
--- a/windows/alloca.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * This file is part of the Micro Python project, http://micropython.org/
- *
- * The MIT License (MIT)
- *
- * Copyright (c) 2013, 2014 Damien P. George
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-// Compatibility header to workaround lack of native alloca.h in some
-// Windows toolchains.
-#include <malloc.h>
diff --git a/windows/mpconfigport.h b/windows/mpconfigport.h
index 94304e20d..63eeb4d96 100644
--- a/windows/mpconfigport.h
+++ b/windows/mpconfigport.h
@@ -92,7 +92,7 @@ void msec_sleep(double msec);
 #endif
 
 
-//  CL specific overrides from mpconfig
+// CL specific overrides from mpconfig
 
 #define NORETURN                   __declspec(noreturn)
 #define MICROPY_PORT_CONSTANTS     { "dummy", 0 } //can't have zero-sized array
@@ -114,7 +114,7 @@ void msec_sleep(double msec);
 
 #include <stddef.h> //for NULL
 #include <assert.h> //for assert
-
+#include <malloc.h> //for alloca()
 
 // Functions implemented in platform code