Changeset bd48f4c in mainline for uspace/srv


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/fs/tmpfs/tmpfs_ops.c

    rc40e6ef rbd48f4c  
    4141#include <ipc/ipc.h>
    4242#include <macros.h>
    43 #include <limits.h>
     43#include <stdint.h>
    4444#include <async.h>
    4545#include <errno.h>
  • uspace/srv/net/tl/icmp/icmp.c

    rc40e6ef rbd48f4c  
    9898/** Free identifier numbers pool end.
    9999 */
    100 #define ICMP_FREE_IDS_END       MAX_UINT16
     100#define ICMP_FREE_IDS_END       UINT16_MAX
    101101
    102102/** Computes the ICMP datagram checksum.
     
    263263        }else{
    264264                res = icmp_echo(echo_data->identifier, echo_data->sequence_number, size, timeout, ttl, tos, dont_fragment, addr, addrlen);
    265                 if(echo_data->sequence_number < MAX_UINT16){
     265                if(echo_data->sequence_number < UINT16_MAX){
    266266                        ++ echo_data->sequence_number;
    267267                }else{
     
    731731                                                        fibril_rwlock_write_unlock(&icmp_globals.lock);
    732732                                                        free(addr);
    733                                                         if(echo_data->sequence_number < MAX_UINT16){
     733                                                        if(echo_data->sequence_number < UINT16_MAX){
    734734                                                                ++ echo_data->sequence_number;
    735735                                                        }else{
  • uspace/srv/vfs/vfs_ops.c

    rc40e6ef rbd48f4c  
    3939#include <ipc/ipc.h>
    4040#include <macros.h>
    41 #include <limits.h>
     41#include <stdint.h>
    4242#include <async.h>
    4343#include <errno.h>
Note: See TracChangeset for help on using the changeset viewer.