diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-07-10 02:02:51 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-07-09 23:06:41 -0700 |
| commit | eb9661fef9f59587f898371f97a0952ac14d125f (patch) | |
| tree | 3dc0a93df2785212e565c4c3660a84799689f4f8 | |
| parent | 854c1fa4a1e90288d1e2f3777fac3e1a9acb1235 (diff) | |
Make extension.h self-contained, remove C++ externs
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@fooishbar.org>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
| -rw-r--r-- | include/extension.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/extension.h b/include/extension.h index c7f51b9d1..f0560d7ef 100644 --- a/include/extension.h +++ b/include/extension.h @@ -47,7 +47,9 @@ SOFTWARE. #ifndef EXTENSION_H #define EXTENSION_H -_XFUNCPROTOBEGIN +#include <X11/Xfuncproto.h> + +#include "dixstruct.h" extern _X_EXPORT unsigned short StandardMinorOpcode(ClientPtr /*client */ ); @@ -60,5 +62,4 @@ extern _X_EXPORT void InitExtensions(int argc, char **argv); extern _X_EXPORT void CloseDownExtensions(void); -_XFUNCPROTOEND #endif /* EXTENSION_H */ |