diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-10-14 11:16:59 +1100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-10-14 11:16:59 +1100 |
commit | 551e95502765bae58d5ccf57635e4977b7b47b9b (patch) | |
tree | d0c797cbc5044a882e1aac6094f661edb2c070d1 /source3/include/nameserv.h | |
parent | 9dcbddd5c61e8bf2814e97e53e7c518df87661c0 (diff) | |
parent | 4746f79d50d804b0e9d5d5cc0d4796dee54d052c (diff) | |
download | samba-551e95502765bae58d5ccf57635e4977b7b47b9b.tar.gz samba-551e95502765bae58d5ccf57635e4977b7b47b9b.tar.bz2 samba-551e95502765bae58d5ccf57635e4977b7b47b9b.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
Diffstat (limited to 'source3/include/nameserv.h')
-rw-r--r-- | source3/include/nameserv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/include/nameserv.h b/source3/include/nameserv.h index a7d46e72d8..496d87e2db 100644 --- a/source3/include/nameserv.h +++ b/source3/include/nameserv.h @@ -208,7 +208,7 @@ struct nmb_data { time_t death_time; /* The time the record must be removed (do not remove if 0). */ time_t refresh_time; /* The time the record should be refreshed. */ - SMB_BIG_UINT id; /* unique id */ + uint64_t id; /* unique id */ struct in_addr wins_ip; /* the adress of the wins server this record comes from */ int wins_flags; /* similar to the netbios flags but different ! */ @@ -606,7 +606,7 @@ typedef struct _WINS_RECORD { char type; int nb_flags; int wins_flags; - SMB_BIG_UINT id; + uint64_t id; int num_ips; struct in_addr ip[25]; struct in_addr wins_ip; |