diff options
| author | Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> | 2012-10-16 17:29:06 +0300 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-10-16 10:50:02 -0400 |
| commit | 80e6b7d7ed0b8fdedb85f88f193bbe8da692420f (patch) | |
| tree | 38ba42623c56f27a242feb4d5e9dcb9bfbe53054 /src | |
| parent | protocol: Clarify pointer axis event (diff) | |
| download | wayland-80e6b7d7ed0b8fdedb85f88f193bbe8da692420f.tar wayland-80e6b7d7ed0b8fdedb85f88f193bbe8da692420f.tar.gz wayland-80e6b7d7ed0b8fdedb85f88f193bbe8da692420f.tar.bz2 wayland-80e6b7d7ed0b8fdedb85f88f193bbe8da692420f.tar.lz wayland-80e6b7d7ed0b8fdedb85f88f193bbe8da692420f.tar.xz wayland-80e6b7d7ed0b8fdedb85f88f193bbe8da692420f.tar.zst wayland-80e6b7d7ed0b8fdedb85f88f193bbe8da692420f.zip | |
doc: Put wl_display_flush() documentation in the right place
It seems a rebase error caused it to end up in the wrong place.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wayland-client.c | 24 |
1 files 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) { |