Don't depend on GNU inline semantic.

3 files changed, 46 insertions, 1 deletions

diff --git a/cad/adms/distinfo b/cad/adms/distinfo
index 94c9956eef8..b7bba12dc5f 100644
--- a/cad/adms/distinfo
+++ b/cad/adms/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.2 2007/05/12 11:33:42 dmcmahill Exp $
+$NetBSD: distinfo,v 1.3 2012/05/04 16:03:13 joerg Exp $
 
 SHA1 (adms-2.2.5.tar.gz) = 03093643feee7ef759cf2f65b497155e2e0df791
 RMD160 (adms-2.2.5.tar.gz) = 274f2330696e9e0825b77a3a3ca0a307e9f00bed
 Size (adms-2.2.5.tar.gz) = 706220 bytes
 SHA1 (patch-aa) = d1aae5799925a164841b7905ef991d261a33867a
 SHA1 (patch-ab) = fc6914555c5ccaa33c1b787f705ce6a205d83235
+SHA1 (patch-admsVeriloga_verilogaLex.l) = d064e39c6e265d8e9af1b623cc88a1c005cdd67b
+SHA1 (patch-admsXml_admsXml.c) = 2bebb05f316177326f064088381623850694c8f0
diff --git a/cad/adms/patches/patch-admsVeriloga_verilogaLex.l b/cad/adms/patches/patch-admsVeriloga_verilogaLex.l
new file mode 100644
index 00000000000..b5b754b6bc9
--- /dev/null
+++ b/cad/adms/patches/patch-admsVeriloga_verilogaLex.l
@@ -0,0 +1,30 @@
+$NetBSD: patch-admsVeriloga_verilogaLex.l,v 1.1 2012/05/04 16:03:13 joerg Exp $
+
+--- admsVeriloga/verilogaLex.l.orig	2012-04-28 21:40:07.000000000 +0000
++++ admsVeriloga/verilogaLex.l
+@@ -33,14 +33,14 @@ void adms_veriloga_error (const char *s)
+   adms_message_fatal(("%s: during lexical analysis %s at line %i -- see '%s'\n",
+     adms_admsmain_valueof_filename(adms_global_admsmain())->_value,s,adms_admsmain_valueof_curline(adms_global_admsmain ()),adms_veriloga_text))
+ }
+-inline void POS_UPDATE(const int myyyleng,const char*myyytext)
++static inline void POS_UPDATE(const int myyyleng,const char*myyytext)
+ {
+   int fpos=adms_admsmain_valueof_fpos(adms_global_admsmain());
+   adms_message_dbg_vla(("%s:%i:%i-%i read token '%s'\n",adms_admsmain_valueof_filename(adms_global_admsmain())->_value,
+     adms_admsmain_valueof_curline(adms_global_admsmain()),fpos+1,fpos+myyyleng,myyytext))
+   adms_admsmain_valueto_fpos(adms_global_admsmain(),fpos+myyyleng);
+ }
+-inline void TKRETURN(const char*myyytext, const int myyyleng)
++static inline void TKRETURN(const char*myyytext, const int myyyleng)
+ {
+   POS_UPDATE(myyyleng,myyytext);
+   adms_veriloga_lval._lexval=adms_lexval_new(
+@@ -50,7 +50,7 @@ inline void TKRETURN(const char*myyytext
+     adms_admsmain_valueof_fpos(adms_global_admsmain())
+   );
+ }
+-inline void TKSTRIPPEDRETURN(const char*myyytext, const int myyyleng)
++static inline void TKSTRIPPEDRETURN(const char*myyytext, const int myyyleng)
+ {
+   char*mystrippedstring;
+   int mynewlen=strlen(myyytext)-2;
diff --git a/cad/adms/patches/patch-admsXml_admsXml.c b/cad/adms/patches/patch-admsXml_admsXml.c
new file mode 100644
index 00000000000..6bf90646885
--- /dev/null
+++ b/cad/adms/patches/patch-admsXml_admsXml.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-admsXml_admsXml.c,v 1.1 2012/05/04 16:03:13 joerg Exp $
+
+--- admsXml/admsXml.c.orig	2012-04-28 21:39:15.000000000 +0000
++++ admsXml/admsXml.c
+@@ -254,6 +254,8 @@
+ #include <admsObject/admsC.h>
+ #include <time.h>
+ 
++#define inline static inline
++
+ static int adms_donouse_xml_implicit_file=0;
+ 
+ static p_admsttransform adms_admstpath_admsttransform(p_admsttransform myadmsttransform,const char*myname)