X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fyaz-asncomp;h=e155e5b2e44f2a5cc4ea987a31c903a4a83d0994;hb=3e45202a276daf769ce4727bc47147a1e669d4b1;hp=280ac3f07a839942baf3621d2b6d16abb951dae4;hpb=057984051852854ce4125491a5acd2c54baa01e2;p=yaz-moved-to-github.git

diff --git a/util/yaz-asncomp b/util/yaz-asncomp
index 280ac3f..e155e5b 100755
--- a/util/yaz-asncomp
+++ b/util/yaz-asncomp
@@ -1,13 +1,9 @@
-#!/bin/sh
-# the next line restarts using tclsh \
-if [ -f /usr/local/bin/tclsh8.4 ]; then exec tclsh8.4 "$0" "$@"; echo exec tclsh "$0" "$@"; fi
+#!/usr/bin/tclsh
 #
 # yaz-comp: ASN.1 Compiler for YAZ
-# (c) Index Data 1996-2004
+# (c) Index Data 1996-2011
 # See the file LICENSE for details.
 #
-# $Id: yaz-asncomp,v 1.6 2006-05-22 15:52:40 mike Exp $
-#
 
 set yc_version 0.4
 
@@ -523,7 +519,7 @@ proc asnSequence {name tag implicit tagtype} {
 
         lappend l "\tif (!odr_sequence_begin (o, p, sizeof(**p), 0))"
         lappend l "\t\{"
-	lappend l "\t\tif(o->direction == ODR_DECODE)"
+	lappend l "\t\tif (o->direction == ODR_DECODE)"
         lappend l "\t\t\t*p = 0;"
         lappend l "\t\treturn 0;"
         lappend l "\t\}"
@@ -736,7 +732,7 @@ proc asnOf {name tag implicit tagtype isset} {
     }
     lappend j "\}"
     lappend l "\t\treturn 1;"
-    lappend l "\tif(o->direction == ODR_DECODE)"
+    lappend l "\tif (o->direction == ODR_DECODE)"
     lappend l "\t\t*p = 0;"
     lappend l "\treturn odr_missing(o, opt, name);"
     return [list [join $l \n] [join $j \n]]
@@ -851,7 +847,7 @@ proc asnChoice {name tag implicit tagtype} {
     }
     lappend l "\t\treturn 1;"
 
-    lappend l "\tif(o->direction == ODR_DECODE)"
+    lappend l "\tif (o->direction == ODR_DECODE)"
     lappend l "\t\t*p = 0;"
 
     lappend l "\treturn odr_missing(o, opt, name);"
@@ -1096,6 +1092,11 @@ proc asnModules {} {
 	    puts $file(outc) ""
 	    puts $file(outc) "    ${greeting} ${yc_version}"
 	    puts $file(outc) "*/"
+
+	    puts $file(outc) "\#if HAVE_CONFIG_H"
+	    puts $file(outc) "\#include <config.h>"
+	    puts $file(outc) "\#endif"
+
 	    puts $file(outc) {}
 
 	    puts $file(outh) "/** \\file $inf(h-file)"
@@ -1221,11 +1222,11 @@ proc asnBasicEXTERNAL {} {
 }
 
 proc asnBasicINTEGER {} {
-    return {odr_integer {int}}
+    return {odr_integer {Odr_int}}
 }
 
 proc asnBasicENUMERATED {} {
-    return {odr_enum {int}}
+    return {odr_enum {Odr_int}}
 }
 
 proc asnBasicNULL {} {
@@ -1233,7 +1234,7 @@ proc asnBasicNULL {} {
 }
 
 proc asnBasicBOOLEAN {} {
-    return {odr_bool {bool_t}}
+    return {odr_bool {Odr_bool}}
 }
 
 proc asnBasicOCTET {} {