Changeset bd48f4c in mainline for uspace/srv

Timestamp:

2010-07-12T10:53:30Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd11d3e

Parents:

c40e6ef (diff), bee2d4c (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.

Location:

uspace/srv

Files:

• fs/tmpfs/tmpfs_ops.c (modified) (1 diff)
• net/tl/icmp/icmp.c (modified) (3 diffs)
• vfs/vfs_ops.c (modified) (1 diff)

uspace/srv/fs/tmpfs/tmpfs_ops.c

@@ -41 +41 @@
 #include <ipc/ipc.h>
 #include <macros.h>
-#include <limits.h>
+#include <stdint.h>
 #include <async.h>
 #include <errno.h>

uspace/srv/net/tl/icmp/icmp.c

@@ -98 +98 @@
 /** Free identifier numbers pool end.
  */
-#define ICMP_FREE_IDS_END       MAX_UINT16
+#define ICMP_FREE_IDS_END       UINT16_MAX
 
 /** Computes the ICMP datagram checksum.
@@ -263 +263 @@
         }else{
                 res = icmp_echo(echo_data->identifier, echo_data->sequence_number, size, timeout, ttl, tos, dont_fragment, addr, addrlen);
-                if(echo_data->sequence_number < MAX_UINT16){
+                if(echo_data->sequence_number < UINT16_MAX){
                         ++ echo_data->sequence_number;
                 }else{
@@ -731 +731 @@
                                                         fibril_rwlock_write_unlock(&icmp_globals.lock);
                                                         free(addr);
-                                                        if(echo_data->sequence_number < MAX_UINT16){
+                                                        if(echo_data->sequence_number < UINT16_MAX){
                                                                 ++ echo_data->sequence_number;
                                                         }else{

uspace/srv/vfs/vfs_ops.c

@@ -39 +39 @@
 #include <ipc/ipc.h>
 #include <macros.h>
-#include <limits.h>
+#include <stdint.h>
 #include <async.h>
 #include <errno.h>