mapi: Move mapi_func typedef to entry.h.

Make it clear that entry.h does not depend on stub.h.

diff --git a/src/mapi/mapi/entry.h b/src/mapi/mapi/entry.h
index 4d7e1f6d16e6079ac634b494fc1894bb83e499f0..9df81000470d0c4fb7083f2404216f20013e4400 100644 (file)
--- a/src/mapi/mapi/entry.h
+++ b/src/mapi/mapi/entry.h
@@ -30,7 +30,8 @@
 #define _ENTRY_H_
 
 #include "u_compiler.h"
-#include "stub.h"
+
+typedef void (*mapi_func)(void);
 
 void
 entry_patch_public(void);

diff --git a/src/mapi/mapi/stub.h b/src/mapi/mapi/stub.h
index e72e530e290be1c0cf451dd50b2a04dd1153b07d..b2b6f1839c607e12afa05b0567742ecb6a7c9f93 100644 (file)
--- a/src/mapi/mapi/stub.h
+++ b/src/mapi/mapi/stub.h
@@ -29,7 +29,7 @@
 #ifndef _STUB_H_
 #define _STUB_H_
 
-typedef void (*mapi_func)(void);
+#include "entry.h"
 
 struct mapi_stub;
 

diff --git a/src/mapi/mapi/table.c b/src/mapi/mapi/table.c
index 7c760201a97eeb08544e9ba04c33255a3106be63..4e16e8d0da291458a43b9e945d47498f0eec0d56 100644 (file)
--- a/src/mapi/mapi/table.c
+++ b/src/mapi/mapi/table.c
@@ -29,7 +29,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "stub.h"
 #include "table.h"
 
 static void

diff --git a/src/mapi/mapi/table.h b/src/mapi/mapi/table.h
index c93ebe75cf9b932e7ff6f9020f84a9c8829fb6b2..d84523f777799ee0a7bf1a74a14eaa6391ae2f06 100644 (file)
--- a/src/mapi/mapi/table.h
+++ b/src/mapi/mapi/table.h
@@ -30,7 +30,7 @@
 #define _TABLE_H_
 
 #include "u_compiler.h"
-#include "stub.h"
+#include "entry.h"
 
 #define MAPI_TMP_TABLE
 #include "mapi_tmp.h"