Mesa (master): mapi: Move mapi_func typedef to entry.h.
Chia-I Wu
olv at kemper.freedesktop.org
Fri Dec 24 09:34:23 UTC 2010
Module: Mesa
Branch: master
Commit: a91a337a7dce11b1904387072e90bdc8b9366638
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a91a337a7dce11b1904387072e90bdc8b9366638
Author: Chia-I Wu <olv at lunarg.com>
Date: Fri Dec 24 17:26:08 2010 +0800
mapi: Move mapi_func typedef to entry.h.
Make it clear that entry.h does not depend on stub.h.
---
src/mapi/mapi/entry.h | 3 ++-
src/mapi/mapi/stub.h | 2 +-
src/mapi/mapi/table.c | 1 -
src/mapi/mapi/table.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/mapi/mapi/entry.h b/src/mapi/mapi/entry.h
index 4d7e1f6..9df8100 100644
--- 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 e72e530..b2b6f18 100644
--- 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 7c76020..4e16e8d 100644
--- 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 c93ebe7..d84523f 100644
--- 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"
More information about the mesa-commit
mailing list