Changeset 92574f4 in mainline for uspace/app/ping/ping.c

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/app/ping/ping.c (modified) (4 diffs)

uspace/app/ping/ping.c

@@ -35 +35 @@
  */
 
+#include <async.h>
 #include <stdio.h>
 #include <str.h>
 #include <task.h>
 #include <time.h>
-#include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <str_error.h>
@@ -355 +355 @@
                             str_error(ret));
                         
-                        ipc_hangup(icmp_phone);
+                        async_hangup(icmp_phone);
                         return ret;
                 }
@@ -370 +370 @@
                             str_error(ret));
                         
-                        ipc_hangup(icmp_phone);
+                        async_hangup(icmp_phone);
                         return ret;
                 }
@@ -390 +390 @@
         }
         
-        ipc_hangup(icmp_phone);
+        async_hangup(icmp_phone);
         
         return 0;