diff options
| author | Jeremy Allison <jra@samba.org> | 2005-06-24 20:25:18 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:58:00 -0500 |
| commit | 19ca97a70f6b7b41d251eaa76e4d3c980c6eedff (patch) | |
| tree | 18d7d81e2c1aa7cf9325899b7e8fc90b41c14c8b /source3/include/smb.h | |
| parent | 8387af752f81e26f1c141f6053bf6d106f0af5eb (diff) | |
| download | samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.tar.gz samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.tar.bz2 samba-19ca97a70f6b7b41d251eaa76e4d3c980c6eedff.zip | |
r7882: Looks like a large patch - but what it actually does is make Samba
safe for using our headers and linking with C++ modules. Stops us
from using C++ reserved keywords in our code.
Jeremy
(This used to be commit 9506b8e145982b1160a2f0aee5c9b7a54980940a)
Diffstat (limited to 'source3/include/smb.h')
| -rw-r--r-- | source3/include/smb.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h index 4bf967bf35..658b52a2ff 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -450,11 +450,10 @@ typedef struct files_struct { #include "sysquotas.h" /* used to hold an arbitrary blob of data */ -typedef struct data_blob -{ +typedef struct data_blob_ { uint8 *data; size_t length; - void (*free)(struct data_blob *data_blob); + void (*free)(struct data_blob_ *data_blob); } DATA_BLOB; /* @@ -747,7 +746,7 @@ struct parm_struct { const char *label; parm_type type; - parm_class class; + parm_class p_class; void *ptr; BOOL (*special)(int snum, const char *, char **); const struct enum_list *enum_list; @@ -1586,13 +1585,12 @@ struct nmb_name { unsigned int name_type; }; - /* A netbios node status array element. */ -struct node_status { +typedef struct node_status_ { nstring name; unsigned char type; unsigned char flags; -}; +} NODE_STATUS_STRUCT; /* The extra info from a NetBIOS node status query */ struct node_status_extra { |