[PATCH 02/37] Make extension.h self-contained, remove C++ externs

[Daniel Stone]

externsion.h required bits from Xfuncproto.h and dixstruct.h, but
included neither; fix that.

It also had _XFUNCPROTOBEGIN and _XFUNCPROTOEND wrappers, which is a bit
pointless for a server-only library, as it's only needed for C++.

Signed-off-by: Daniel Stone <daniel at fooishbar.org>
---
 include/extension.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/extension.h b/include/extension.h
index 29a11c3..d24301d 100644
--- a/include/extension.h
+++ b/include/extension.h
@@ -48,7 +48,9 @@ SOFTWARE.
 #ifndef EXTENSION_H
 #define EXTENSION_H 
 
-_XFUNCPROTOBEGIN
+#include <X11/Xfuncproto.h>
+
+#include "dixstruct.h"
 
 extern _X_EXPORT unsigned short StandardMinorOpcode(ClientPtr /*client*/);
 
@@ -62,6 +64,4 @@ extern _X_EXPORT void InitExtensions(int argc, char **argv);
 
 extern _X_EXPORT void CloseDownExtensions(void);
 
-_XFUNCPROTOEND
-
 #endif /* EXTENSION_H */
-- 
1.7.5.4