summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2002-01-01 04:05:10 +0000
committerAndrew Tridgell <tridge@samba.org>2002-01-01 04:05:10 +0000
commitc0fb3e1396d04671df456e4805b331e33f7f543d (patch)
tree56d45e11bbcd7f66c8e749310680e65632a34d8d
parent4a6d1318bd9123f5a9c1d72721a9175320356fbe (diff)
downloadsamba-c0fb3e1396d04671df456e4805b331e33f7f543d.tar.gz
samba-c0fb3e1396d04671df456e4805b331e33f7f543d.tar.bz2
samba-c0fb3e1396d04671df456e4805b331e33f7f543d.zip
renamed ans1.h to asn_1.h to prevent conflict caused by krb5 headers
on some platforms using "" instead of <> in include statements (This used to be commit d0ba307032340a22d77cb1d8fc78b4234e1a963c)
-rw-r--r--source3/include/asn_1.h (renamed from source3/include/asn1.h)0
-rw-r--r--source3/include/includes.h2
2 files changed, 1 insertions, 1 deletions
diff --git a/source3/include/asn1.h b/source3/include/asn_1.h
index ae3cd22dde..ae3cd22dde 100644
--- a/source3/include/asn1.h
+++ b/source3/include/asn_1.h
diff --git a/source3/include/includes.h b/source3/include/includes.h
index c113a14f62..70fc41034c 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -724,7 +724,7 @@ extern int errno;
#include "session.h"
-#include "asn1.h"
+#include "asn_1.h"
#include "popt.h"