[PATCH wayland 1/4] doc: Put wl_display_flush() documentation in the right place

Ander Conselvan de Oliveira ander.conselvan.de.oliveira at intel.com
Tue Oct 16 07:29:06 PDT 2012


It seems a rebase error caused it to end up in the wrong place.
---
 src/wayland-client.c |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/wayland-client.c b/src/wayland-client.c
index 471abf3..2de80fd 100644
--- a/src/wayland-client.c
+++ b/src/wayland-client.c
@@ -855,18 +855,6 @@ wl_display_dispatch_pending(struct wl_display *display)
 	return dispatch_queue(display, &display->queue, 0);
 }
 
-/** Send all buffered request on the display to the server
- *
- * \param display The display context object
- * \return The number of bytes send on success or -1 on failure
- *
- * Send all buffered data on the client side to the server. Clients
- * should call this function before blocking. On success, the number
- * of bytes sent to the server is returned. On failure, this
- * function returns -1 and errno is set appropriately.
- *
- * \memberof wl_display
- */
 WL_EXPORT int
 wl_display_get_error(struct wl_display *display)
 {
@@ -881,6 +869,18 @@ wl_display_get_error(struct wl_display *display)
 	return ret;
 }
 
+/** Send all buffered request on the display to the server
+ *
+ * \param display The display context object
+ * \return The number of bytes send on success or -1 on failure
+ *
+ * Send all buffered data on the client side to the server. Clients
+ * should call this function before blocking. On success, the number
+ * of bytes sent to the server is returned. On failure, this
+ * function returns -1 and errno is set appropriately.
+ *
+ * \memberof wl_display
+ */
 WL_EXPORT int
 wl_display_flush(struct wl_display *display)
 {
-- 
1.7.9.5



More information about the wayland-devel mailing list