Changeset 13317


Ignore:
Timestamp:
May 27, 2012, 3:27:59 PM (9 years ago)
Author:
livings124
Message:

update libutp, fixing #4915

Location:
trunk/third-party/libutp
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/third-party/libutp/templates.h

    r12663 r13317  
    4444}
    4545
     46#if (defined(__SVR4) && defined(__sun))
     47#pragma pack(1)
     48#else
    4649#pragma pack(push,1)
     50#endif
    4751
    4852namespace aux
     
    6973typedef big_endian<uint16> uint16_big;
    7074
     75#if (defined(__SVR4) && defined(__sun))
     76#pragma pack(0)
     77#else
    7178#pragma pack(pop)
     79#endif
    7280
    7381template<typename T> static inline void zeromem(T *a, size_t count = 1) { memset(a, 0, count * sizeof(T)); }
  • trunk/third-party/libutp/utp.cpp

    r12663 r13317  
    9393#define addrfmt(x, s) x.fmt(s, sizeof(s))
    9494
     95#if (defined(__SVR4) && defined(__sun))
     96#pragma pack(1)
     97#else
    9598#pragma pack(push,1)
     99#endif
    96100
    97101struct PACKED_ATTRIBUTE PackedSockAddr {
     
    281285};
    282286
     287#if (defined(__SVR4) && defined(__sun))
     288#pragma pack(0)
     289#else
    283290#pragma pack(pop)
     291#endif
    284292
    285293enum {
  • trunk/third-party/libutp/utp.h

    r11919 r13317  
    1313#else
    1414#include <stdlib.h>
     15#include <sys/types.h>
    1516#include <sys/socket.h>
     17#include <netinet/in.h>
    1618#include <arpa/inet.h>
    1719#endif
  • trunk/third-party/libutp/utypes.h

    r12954 r13317  
    3636typedef char * str;
    3737
     38#ifndef __cplusplus
     39typedef uint8 bool;
     40#endif
     41
    3842#endif //__UTYPES_H__
Note: See TracChangeset for help on using the changeset viewer.