Import changes from head: generate ldaptclerr.h correctly.

diff --git a/contrib/ldaptcl/ldaperr.tcl b/contrib/ldaptcl/ldaperr.tcl
index ef77d7f73653330902ae13678debe005afc78bc6..84bba4e440a752aad22263c2ba7a0be14192acd9 100644 (file)
--- a/contrib/ldaptcl/ldaperr.tcl
+++ b/contrib/ldaptcl/ldaperr.tcl
@@ -11,14 +11,20 @@ proc genstrings {path} {
     puts -nonewline "char *ldaptclerrorcode\[\] = {
        NULL"
     while {[gets $fp line] != -1} {
-       #puts stderr $line
+       puts stderr $line
        if {[clength $line] == 0 || [ctype space $line]} continue
-       if {![string match #define* $line]} break
+       if {[string match *typedef* $line]} break
+       if {![string match #define* $line]} continue
        if {![string match "#define LDAP_*" $line]} continue
        if {[string match "*LDAP_RANGE*" $line]} continue
+       if {[string match "*LDAP_API_RESULT*" $line]} continue
+       if {[string match {*\\} $line]} {
+           append line [gets $fp]
+       }
        lassign $line define macro value
        set ldap_errcode($macro) $value
     }
+    #parray ldap_errcode
     foreach i [array names ldap_errcode] {
        set value $ldap_errcode($i)
        #puts stderr "checking $value"