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>
This commit is contained in:
parent
854c1fa4a1
commit
eb9661fef9
|
@ -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 */
|
||||
|
|
Loading…
Reference in New Issue
Block a user