Changeset c47e1a8 in mainline for uspace/lib/c/generic/clipboard.c

Timestamp:

2010-05-21T07:50:04Z (16 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes (rev. 451)

File:

• uspace/lib/c/generic/clipboard.c (moved) (moved from uspace/lib/libc/generic/clipboard.c ) (2 diffs)

uspace/lib/c/generic/clipboard.c

@@ -42 +42 @@
 #include <ipc/clipboard.h>
 #include <async.h>
-#include <string.h>
+#include <str.h>
 #include <errno.h>
 #include <malloc.h>
@@ -148 +148 @@
                         aid_t req = async_send_1(clip_phone, CLIPBOARD_GET_DATA, tag, NULL);
                         rc = async_data_read_start(clip_phone, (void *) sbuf, size);
-                        if (rc == EOVERFLOW) {
+                        if ((int) rc == EOVERFLOW) {
                                 /*
                                  * The data in the clipboard has changed since