diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-12-13 19:38:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:47:19 -0500 |
| commit | efe67458c17ffa52b48f979505caf11c2ac52c4e (patch) | |
| tree | 996874beb2ccc26e2434f4e19f7d5916b8bbc6c1 /source4/include | |
| parent | d8c4862d8cb4ab0c87e35f0aa6a91731f55d718b (diff) | |
| download | samba-efe67458c17ffa52b48f979505caf11c2ac52c4e.tar.gz samba-efe67458c17ffa52b48f979505caf11c2ac52c4e.tar.bz2 samba-efe67458c17ffa52b48f979505caf11c2ac52c4e.zip | |
r12216: Couple of small fixes: reduce include/includes.h a bit, simplify headers
in build/smb_build/, remove unused pstring macros
(This used to be commit 432296207400636dd81d0929ec7b1b4cebbcaa62)
Diffstat (limited to 'source4/include')
| -rw-r--r-- | source4/include/includes.h | 5 | ||||
| -rw-r--r-- | source4/include/safe_string.h | 9 | ||||
| -rw-r--r-- | source4/include/structs.h | 4 |
3 files changed, 4 insertions, 14 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h index f2da31eed6..18fc38031c 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -112,7 +112,6 @@ struct ipv4_addr { #include "smb_interfaces.h" #include "ntvfs/ntvfs.h" #include "cli_context.h" -#include "lib/com/com.h" #include "auth/credentials/credentials.h" /***** automatically generated prototypes *****/ @@ -161,8 +160,4 @@ extern int DEBUGLEVEL; #define discard_const(ptr) ((void *)((intptr_t)(ptr))) #define discard_const_p(type, ptr) ((type *)discard_const(ptr)) -#ifndef UINT16_MAX -#define UINT16_MAX 65535 -#endif - #endif /* _INCLUDES_H */ diff --git a/source4/include/safe_string.h b/source4/include/safe_string.h index 7c2b93270c..57c5d21429 100644 --- a/source4/include/safe_string.h +++ b/source4/include/safe_string.h @@ -57,13 +57,4 @@ #define strlower(s) strlower_m(s) #define strupper(s) strupper_m(s) -/* the addition of the DEVELOPER checks in safe_strcpy means we must - * update a lot of code. To make this a little easier here are some - * functions that provide the lengths with less pain */ -#define pstrcpy_base(dest, src, pstring_base) \ - safe_strcpy(dest, src, sizeof(pstring)-PTR_DIFF(dest,pstring_base)-1) - -#define push_pstring_base(dest, src, pstring_base) \ - push_ascii(dest, src, sizeof(pstring)-PTR_DIFF(dest,pstring_base)-1, STR_TERMINATE) - #endif diff --git a/source4/include/structs.h b/source4/include/structs.h index 89b8bf9dcf..b6ccd0ce19 100644 --- a/source4/include/structs.h +++ b/source4/include/structs.h @@ -365,3 +365,7 @@ struct smb2_find; struct smb2_ioctl; struct smb2_flush; struct smb2_handle; + +struct com_context; +struct IUnknown; +struct IUnknown_vtable; |