fix compilation with c++ compilers. Remove some trailing spaces

[free-sw/xcb/libxcb] / src / xcb.h

diff --git a/src/xcb.h b/src/xcb.h
index 8e990fd..85d0658 100644 (file)
--- a/src/xcb.h
+++ b/src/xcb.h
@@ -25,8 +25,8 @@
  * authorization from the authors.
  */
 
-#ifndef __XCB_H
-#define __XCB_H
+#ifndef __XCB_H__
+#define __XCB_H__
 #include <sys/types.h>
 
 /* TODO: check for stdint in config? (HAVE_STDINT) fallback? */
@@ -48,10 +48,12 @@ typedef int32_t  INT32;
 #include <sys/uio.h>
 #include <pthread.h>
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+
 #if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
 #define deprecated __attribute__((__deprecated__))
 #else
@@ -477,11 +479,11 @@ XCBConnection *XCBConnectToDisplayWithAuthInfo(const char *display, XCBAuthInfo
  * @param e: A pointer to an error.
  * @return @c 1 on success, @c 0 otherwise.
  *
- * Blocks the calling thread for the duration of one round trip to the
- * server, ensuring that all events and errors caused by previous
- * requests are available to XCB.
+ * @deprecated This function is deprecated. It must not be used in
+ * newly written code.  XCBFlush is more efficient.
+ * Use XCBAuxSync if absolutely necessary.
  */
-int XCBSync(XCBConnection *c, XCBGenericError **e);
+int XCBSync(XCBConnection *c, XCBGenericError **e) deprecated;
 
 
 /**
@@ -534,4 +536,5 @@ XCBGenericIter XCBConnSetupSuccessRepEnd(XCBSetupIter i) deprecated;
 }
 #endif
 
-#endif
+
+#endif /* __XCB_H__ */