diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-05 18:01:04 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-05 18:01:04 +0100 |
| commit | 37e6849d451c4f49c6a0c96a78a5ef81baab83d4 (patch) | |
| tree | d1e443f66fa367340ef04d39349e50e7100b9b5f /source3/include/includes.h | |
| parent | de7dc2cec059305d28cc75a5347bfd88f3cb5c95 (diff) | |
| parent | 0581094023ba5e561184a2ea57f6e905161de978 (diff) | |
| download | samba-37e6849d451c4f49c6a0c96a78a5ef81baab83d4.tar.gz samba-37e6849d451c4f49c6a0c96a78a5ef81baab83d4.tar.bz2 samba-37e6849d451c4f49c6a0c96a78a5ef81baab83d4.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/include/includes.h')
| -rw-r--r-- | source3/include/includes.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 64be27336d..8b0ff71c4e 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -574,6 +574,8 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx); #include "../talloc/talloc.h" +#include "event.h" + #include "../lib/util/data_blob.h" #include "../lib/util/time.h" #include "../lib/util/asn1.h" @@ -642,7 +644,6 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx); #include "nsswitch/winbind_client.h" #include "spnego.h" #include "rpc_client.h" -#include "event.h" #include "dbwrap.h" #include "packet.h" #include "ctdbd_conn.h" |