diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-23 18:04:16 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-23 18:04:16 +0200 |
commit | d70efa57ceae1011a6a55d57d0152fd1bc2bb192 (patch) | |
tree | 92ee7a3f33ea51f34a33fee094eaed651215a3d3 /lib/util/util.h | |
parent | 2f265feb174de1f743e8102ad34b3bdbcd2897cc (diff) | |
parent | d805c714bb79a709716ec0373670283bfcd23c3c (diff) | |
download | samba-d70efa57ceae1011a6a55d57d0152fd1bc2bb192.tar.gz samba-d70efa57ceae1011a6a55d57d0152fd1bc2bb192.tar.bz2 samba-d70efa57ceae1011a6a55d57d0152fd1bc2bb192.zip |
Merge branch 'master' of git://git.samba.org/samba
Conflicts:
lib/util/asn1_proto.h
Diffstat (limited to 'lib/util/util.h')
-rw-r--r-- | lib/util/util.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/util/util.h b/lib/util/util.h index fc651d58af..e72df023a9 100644 --- a/lib/util/util.h +++ b/lib/util/util.h @@ -44,6 +44,7 @@ extern const char *panic_action; #include "../lib/util/xfile.h" #include "../lib/util/mutex.h" #include "../lib/util/byteorder.h" +#include "../lib/util/talloc_stack.h" /** * assert macros |