From df6567e6345c763182fa237a4497ab94ee6ffc20 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Sun, 30 Mar 2014 13:54:02 +0100
Subject: Merge map.h into obj.h.

Pretty much everyone needs to include map.h, since it's such an integral
part of the Micro Python object implementation.  Thus, the definitions
are now in obj.h instead.  map.h is removed.
---
 unix/ffi.c    | 1 -
 unix/file.c   | 1 -
 unix/main.c   | 1 -
 unix/socket.c | 1 -
 4 files changed, 4 deletions(-)

(limited to 'unix')

diff --git a/unix/ffi.c b/unix/ffi.c
index 71fb0b66ab..cb63869e09 100644
--- a/unix/ffi.c
+++ b/unix/ffi.c
@@ -9,7 +9,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "binary.h"
 
diff --git a/unix/file.c b/unix/file.c
index 948ec44051..bd54e7482c 100644
--- a/unix/file.c
+++ b/unix/file.c
@@ -9,7 +9,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "runtime.h"
 #include "stream.h"
 
diff --git a/unix/main.c b/unix/main.c
index ffbdbb7e79..959499ac34 100644
--- a/unix/main.c
+++ b/unix/main.c
@@ -15,7 +15,6 @@
 #include "lexerunix.h"
 #include "parse.h"
 #include "obj.h"
-#include "map.h"
 #include "parsehelper.h"
 #include "compile.h"
 #include "runtime0.h"
diff --git a/unix/socket.c b/unix/socket.c
index ee74ea0845..113b657fff 100644
--- a/unix/socket.c
+++ b/unix/socket.c
@@ -15,7 +15,6 @@
 #include "mpconfig.h"
 #include "qstr.h"
 #include "obj.h"
-#include "map.h"
 #include "objtuple.h"
 #include "objarray.h"
 #include "runtime.h"
-- 
cgit v1.2.3