ITS#6278 PEM support for MozNSS from rmeggins@redhat.com, with header cleanups

[openldap] / libraries / liblutil / passwd.c

diff --git a/libraries/liblutil/passwd.c b/libraries/liblutil/passwd.c
index dc45c1b5093bf41958027323f82e2cddc1bb99e2..425f682779c15a2522c15cd4cb43d96f2c3c73d8 100644 (file)
--- a/libraries/liblutil/passwd.c
+++ b/libraries/liblutil/passwd.c
@@ -45,6 +45,13 @@ typedef des_key_schedule des_context;
 #define des_finish(key, schedule) 
 
 #elif defined(HAVE_MOZNSS)
+/*
+  hack hack hack
+  We need to define this here so that nspr/obsolete/protypes.h will not be included
+  if that file is included, it will create a uint32 typedef that will cause the
+  one in lutil_sha1.h to blow up
+*/
+#define PROTYPES_H 1
 #      include <pk11pub.h>
 typedef PK11SymKey *des_key;
 typedef unsigned char des_data_block[8];