diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2002-11-09 16:57:45 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2002-11-09 16:57:45 +0000 |
| commit | dc5297f413c40f04e1fdae719e29d949e3301091 (patch) | |
| tree | f806bd40f94aa39af5f2bfb9eafda514b353a90c /source3/include | |
| parent | e21ff2d500ea4709b641834a88d3dff9d6bf039b (diff) | |
| download | samba-dc5297f413c40f04e1fdae719e29d949e3301091.tar.gz samba-dc5297f413c40f04e1fdae719e29d949e3301091.tar.bz2 samba-dc5297f413c40f04e1fdae719e29d949e3301091.zip | |
Sync with HEAD
(This used to be commit 1a25dc776ddc36de9a214e023becff1ceb10290c)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/includes.h | 4 | ||||
| -rw-r--r-- | source3/include/smb.h | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 7d8f44727a..41eda71554 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -1163,5 +1163,9 @@ int asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3); #define VA_COPY(dest, src) (dest) = (src) #endif +#ifndef HAVE_TIMEGM +time_t timegm(struct tm *tm); +#endif + #endif /* _INCLUDES_H */ diff --git a/source3/include/smb.h b/source3/include/smb.h index 4feb81beef..310fd1ace5 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1702,5 +1702,12 @@ typedef struct { extern struct poptOption popt_common_debug[]; extern struct poptOption popt_common_configfile[]; +extern struct poptOption popt_common_socket_options[]; +extern struct poptOption popt_common_version[]; +extern struct poptOption popt_common_netbios_name[]; +extern struct poptOption popt_common_log_base[]; + +/* Module support */ +typedef NTSTATUS (init_module_function) (void); #endif /* _SMB_H */ |