r25516: Sorry, I reverted too much of r25448 in r25515.

These two fixes should have remained! Thanks to
Metze for pointing this out.

Michael

diff --git a/source/libcli/util/werror.h b/source/libcli/util/werror.h
index 0f49514b9fb4a961b1b776d2314ee7734d1cb746..55a4faa6a5c72a283a2524384bede41d45ce02b7 100644 (file)
--- a/source/libcli/util/werror.h
+++ b/source/libcli/util/werror.h
@@ -19,7 +19,7 @@
 */
 
 #ifndef _WERROR_H_
-#define _WERROR_H
+#define _WERROR_H_
 
 #include <stdint.h>
 

diff --git a/source/librpc/ndr/libndr.h b/source/librpc/ndr/libndr.h
index 5b9089fc6d81f0e22a981e7e50f50ae0f1f99344..d110a25aeb706d8752f759936e19296f5ba09971 100644 (file)
--- a/source/librpc/ndr/libndr.h
+++ b/source/librpc/ndr/libndr.h
@@ -285,6 +285,7 @@ typedef void (*ndr_print_fn_t)(struct ndr_print *, const char *, const void *);
 typedef void (*ndr_print_function_t)(struct ndr_print *, const char *, int, const void *);
 
 #include "librpc/gen_ndr/misc.h"
+#include "libcli/util/werror.h"
 #include "librpc/ndr/libndr_proto.h"
 
 extern const struct ndr_syntax_id ndr_transfer_syntax;