From 8014f25f6db719fa62336f997963532a14c568f6 Mon Sep 17 00:00:00 2001
From: Alan Mishchenko <alanmi@berkeley.edu>
Date: Sat, 21 Jan 2012 04:30:10 -0800
Subject: Major restructuring of the code.

---
 src/map/mio/exp.h      |  4 ++--
 src/map/mio/mio.c      |  6 +++---
 src/map/mio/mio.h      |  4 ++--
 src/map/mio/mioForm.c  |  2 +-
 src/map/mio/mioInt.h   | 10 +++++-----
 src/map/mio/mioRead.c  |  2 +-
 src/map/mio/mioUtils.c |  2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/map/mio')

diff --git a/src/map/mio/exp.h b/src/map/mio/exp.h
index fa643325..40dff2e8 100644
--- a/src/map/mio/exp.h
+++ b/src/map/mio/exp.h
@@ -18,8 +18,8 @@
 
 ***********************************************************************/
  
-#ifndef __EXP_H__
-#define __EXP_H__
+#ifndef ABC__map__mio__exp_h
+#define ABC__map__mio__exp_h
 
 ////////////////////////////////////////////////////////////////////////
 ///                          INCLUDES                                ///
diff --git a/src/map/mio/mio.c b/src/map/mio/mio.c
index a034e549..f7eddab2 100644
--- a/src/map/mio/mio.c
+++ b/src/map/mio/mio.c
@@ -22,10 +22,10 @@
 #include <unistd.h>
 #endif
 
-#include "main.h"
+#include "src/base/main/main.h"
 #include "mio.h"
-#include "mapper.h"
-#include "amap.h"
+#include "src/map/mapper/mapper.h"
+#include "src/map/amap/amap.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/map/mio/mio.h b/src/map/mio/mio.h
index de35b637..a31e2e2b 100644
--- a/src/map/mio/mio.h
+++ b/src/map/mio/mio.h
@@ -16,8 +16,8 @@
 
 ***********************************************************************/
 
-#ifndef __MIO_H__
-#define __MIO_H__
+#ifndef ABC__map__mio__mio_h
+#define ABC__map__mio__mio_h
 
 
 ////////////////////////////////////////////////////////////////////////
diff --git a/src/map/mio/mioForm.c b/src/map/mio/mioForm.c
index 5c7a48e6..b3b962c0 100644
--- a/src/map/mio/mioForm.c
+++ b/src/map/mio/mioForm.c
@@ -17,7 +17,7 @@
 ***********************************************************************/
 
 #include "mioInt.h"
-#include "parse.h"
+#include "bdd/parse/parse.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/map/mio/mioInt.h b/src/map/mio/mioInt.h
index 0752e29a..02f081fa 100644
--- a/src/map/mio/mioInt.h
+++ b/src/map/mio/mioInt.h
@@ -16,8 +16,8 @@
 
 ***********************************************************************/
 
-#ifndef __MIO_INT_H__
-#define __MIO_INT_H__
+#ifndef ABC__map__mio__mioInt_h
+#define ABC__map__mio__mioInt_h
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -28,9 +28,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include "vec.h"
-#include "mem.h"
-#include "st.h"
+#include "src/misc/vec/vec.h"
+#include "src/misc/mem/mem.h"
+#include "src/misc/st/st.h"
 #include "mio.h"
  
 ABC_NAMESPACE_HEADER_START
diff --git a/src/map/mio/mioRead.c b/src/map/mio/mioRead.c
index dd57d766..ccbc0ac6 100644
--- a/src/map/mio/mioRead.c
+++ b/src/map/mio/mioRead.c
@@ -18,7 +18,7 @@
 
 #include <ctype.h>
 #include "mioInt.h"
-#include "ioAbc.h"
+#include "src/base/io/ioAbc.h"
 
 ABC_NAMESPACE_IMPL_START
 
diff --git a/src/map/mio/mioUtils.c b/src/map/mio/mioUtils.c
index 09f1ec96..d9447085 100644
--- a/src/map/mio/mioUtils.c
+++ b/src/map/mio/mioUtils.c
@@ -17,7 +17,7 @@
 ***********************************************************************/
 
 #include "mioInt.h"
-#include "main.h"
+#include "src/base/main/main.h"
 #include "exp.h"
 
 ABC_NAMESPACE_IMPL_START
-- 
cgit v1.2.3