diff options
| author | Günther Deschner <gd@samba.org> | 2011-04-13 23:34:25 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-04-14 00:47:57 +0200 |
| commit | b4e4b60719061a04f8b21a6fd9212f1411e6a3f6 (patch) | |
| tree | 156a1906af9b554efcb31d394014766b2078592c | |
| parent | 76d4ede6db5479c4d1436f249ddfeb355762ebc5 (diff) | |
| download | samba-b4e4b60719061a04f8b21a6fd9212f1411e6a3f6.tar.gz samba-b4e4b60719061a04f8b21a6fd9212f1411e6a3f6.tar.bz2 samba-b4e4b60719061a04f8b21a6fd9212f1411e6a3f6.zip | |
s3-includes: include lib/util/debug.h headers in includes.h not smb.h
Guenther
| -rw-r--r-- | lib/util/debug_s3.h | 1 | ||||
| -rw-r--r-- | source3/include/includes.h | 2 | ||||
| -rw-r--r-- | source3/include/smb.h | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/lib/util/debug_s3.h b/lib/util/debug_s3.h index ce8869d64c..96b8ed74d9 100644 --- a/lib/util/debug_s3.h +++ b/lib/util/debug_s3.h @@ -18,6 +18,7 @@ */ struct messaging_context; +struct server_id; void debug_message(struct messaging_context *msg_ctx, void *private_data, uint32_t msg_type, struct server_id src, DATA_BLOB *data); void debug_register_msgs(struct messaging_context *msg_ctx); bool reopen_logs( void ); diff --git a/source3/include/includes.h b/source3/include/includes.h index 2032db537b..f61cb8dec0 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -527,6 +527,8 @@ typedef char fstring[FSTRING_LEN]; #include "../lib/util/data_blob.h" #include "../lib/util/time.h" +#include "../lib/util/debug.h" +#include "../lib/util/debug_s3.h" #include "libads/ads_status.h" #include "../libcli/util/error.h" diff --git a/source3/include/smb.h b/source3/include/smb.h index a6f7e9bd87..8ebde2f4ad 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -70,10 +70,6 @@ /* how long to wait for secondary SMB packets (milli-seconds) */ #define SMB_SECONDARY_WAIT (60*1000) -/* Debugging stuff */ -#include "lib/util/debug.h" -#include "lib/util/debug_s3.h" - /* this defines the error codes that receive_smb can put in smb_read_error */ enum smb_read_errors { SMB_READ_OK = 0, |