Fix inline usage.

3 files changed, 77 insertions, 3 deletions

diff --git a/cad/covered-current/distinfo b/cad/covered-current/distinfo
index 362401f2b9b..ed336b45db5 100644
--- a/cad/covered-current/distinfo
+++ b/cad/covered-current/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2011/12/07 15:15:17 joerg Exp $
+$NetBSD: distinfo,v 1.9 2012/11/16 00:33:17 joerg Exp $
 
 SHA1 (covered-20060904.tar.gz) = 78869b20bc6e032b4dac3a3029c4ea6a97962d3a
 RMD160 (covered-20060904.tar.gz) = c1a9e841f7e0a341bd8bce5c4f04e349e0b07672
 Size (covered-20060904.tar.gz) = 1549138 bytes
-SHA1 (patch-src_lxt2__read.c) = 0e260f7de5ccf52a1cc3ba4bf3d5fdb36dc69c9e
+SHA1 (patch-src_lxt2__read.c) = b08a12cf36fd8d5dc0c8e07469827d734f931b23
+SHA1 (patch-src_lxt2__read.h) = 3179039e6d48b0ccac0198d7107a422d07152a84
diff --git a/cad/covered-current/patches/patch-src_lxt2__read.c b/cad/covered-current/patches/patch-src_lxt2__read.c
index fa24eedc880..563703e7a72 100644
--- a/cad/covered-current/patches/patch-src_lxt2__read.c
+++ b/cad/covered-current/patches/patch-src_lxt2__read.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_lxt2__read.c,v 1.1 2011/12/07 15:15:17 joerg Exp $
+$NetBSD: patch-src_lxt2__read.c,v 1.2 2012/11/16 00:33:18 joerg Exp $
 
 --- src/lxt2_read.c.orig	2006-01-27 15:43:58.000000000 +0000
 +++ src/lxt2_read.c
@@ -13,3 +13,39 @@ $NetBSD: patch-src_lxt2__read.c,v 1.1 2011/12/07 15:15:17 joerg Exp $
          "0" (x));
  
      return (unsigned int) x;
+@@ -1113,7 +1113,7 @@ void lxt2_rd_close( struct lxt2_rd_trace
+ /* 
+  * return number of facs in trace
+  */
+-_LXT2_RD_INLINE lxtint32_t lxt2_rd_get_num_facs( struct lxt2_rd_trace* lt ) {
++lxtint32_t lxt2_rd_get_num_facs( struct lxt2_rd_trace* lt ) {
+ 
+   return( lt ? lt->numfacs : 0 );
+ 
+@@ -1195,7 +1195,7 @@ _LXT2_RD_INLINE lxtint32_t lxt2_rd_get_f
+ 
+ }
+ 
+-_LXT2_RD_INLINE lxtint32_t lxt2_rd_get_alias_root(struct lxt2_rd_trace *lt, lxtint32_t facidx) {
++lxtint32_t lxt2_rd_get_alias_root(struct lxt2_rd_trace *lt, lxtint32_t facidx) {
+ 
+   if( lt && (facidx < lt->numfacs) ) {
+ 
+@@ -1376,7 +1376,7 @@ _LXT2_RD_INLINE int lxt2_rd_clr_fac_proc
+ 
+ }
+ 
+-_LXT2_RD_INLINE int lxt2_rd_set_fac_process_mask_all( struct lxt2_rd_trace* lt ) {
++int lxt2_rd_set_fac_process_mask_all( struct lxt2_rd_trace* lt ) {
+ 
+   int rc = 0;
+ 
+@@ -1407,7 +1407,7 @@ _LXT2_RD_INLINE int lxt2_rd_clr_fac_proc
+ /*
+  * block memory set/get used to control buffering
+  */
+-_LXT2_RD_INLINE lxtint64_t lxt2_rd_set_max_block_mem_usage( struct lxt2_rd_trace* lt, lxtint64_t block_mem_max ) {
++lxtint64_t lxt2_rd_set_max_block_mem_usage( struct lxt2_rd_trace* lt, lxtint64_t block_mem_max ) {
+ 
+   lxtint64_t rc = lt->block_mem_max;
+ 
diff --git a/cad/covered-current/patches/patch-src_lxt2__read.h b/cad/covered-current/patches/patch-src_lxt2__read.h
new file mode 100644
index 00000000000..8fbaa309466
--- /dev/null
+++ b/cad/covered-current/patches/patch-src_lxt2__read.h
@@ -0,0 +1,37 @@
+$NetBSD: patch-src_lxt2__read.h,v 1.1 2012/11/16 00:33:18 joerg Exp $
+
+--- src/lxt2_read.h.orig	2012-11-15 14:27:52.000000000 +0000
++++ src/lxt2_read.h
+@@ -247,12 +247,12 @@ unsigned process_mask_dirty : 1; /* only
+ struct lxt2_rd_trace *       	lxt2_rd_init(const char *name);
+ void                    	lxt2_rd_close(struct lxt2_rd_trace *lt);
+ 
+-_LXT2_RD_INLINE lxtint64_t	lxt2_rd_set_max_block_mem_usage(struct lxt2_rd_trace *lt, lxtint64_t block_mem_max);
++lxtint64_t			lxt2_rd_set_max_block_mem_usage(struct lxt2_rd_trace *lt, lxtint64_t block_mem_max);
+ _LXT2_RD_INLINE lxtint64_t	lxt2_rd_get_block_mem_usage(struct lxt2_rd_trace *lt);
+ _LXT2_RD_INLINE unsigned int	lxt2_rd_get_num_blocks(struct lxt2_rd_trace *lt);
+ unsigned int			lxt2_rd_get_num_active_blocks(struct lxt2_rd_trace *lt);
+ 
+-_LXT2_RD_INLINE lxtint32_t	lxt2_rd_get_num_facs(struct lxt2_rd_trace *lt);
++lxtint32_t			lxt2_rd_get_num_facs(struct lxt2_rd_trace *lt);
+ char *				lxt2_rd_get_facname(struct lxt2_rd_trace *lt, lxtint32_t facidx);
+ struct lxt2_rd_geometry *	lxt2_rd_get_fac_geometry(struct lxt2_rd_trace *lt, lxtint32_t facidx);
+ _LXT2_RD_INLINE lxtint32_t	lxt2_rd_get_fac_rows(struct lxt2_rd_trace *lt, lxtint32_t facidx);
+@@ -260,7 +260,7 @@ _LXT2_RD_INLINE lxtint32_t	lxt2_rd_get_f
+ _LXT2_RD_INLINE lxtint32_t	lxt2_rd_get_fac_lsb(struct lxt2_rd_trace *lt, lxtint32_t facidx);
+ _LXT2_RD_INLINE lxtint32_t	lxt2_rd_get_fac_flags(struct lxt2_rd_trace *lt, lxtint32_t facidx);
+ _LXT2_RD_INLINE lxtint32_t	lxt2_rd_get_fac_len(struct lxt2_rd_trace *lt, lxtint32_t facidx);
+-_LXT2_RD_INLINE lxtint32_t	lxt2_rd_get_alias_root(struct lxt2_rd_trace *lt, lxtint32_t facidx);
++lxtint32_t			lxt2_rd_get_alias_root(struct lxt2_rd_trace *lt, lxtint32_t facidx);
+ 
+ _LXT2_RD_INLINE char		lxt2_rd_get_timescale(struct lxt2_rd_trace *lt);
+ _LXT2_RD_INLINE lxtint64_t	lxt2_rd_get_start_time(struct lxt2_rd_trace *lt);
+@@ -269,7 +269,7 @@ _LXT2_RD_INLINE lxtint64_t	lxt2_rd_get_e
+ _LXT2_RD_INLINE int		lxt2_rd_get_fac_process_mask(struct lxt2_rd_trace *lt, lxtint32_t facidx);
+ _LXT2_RD_INLINE int		lxt2_rd_set_fac_process_mask(struct lxt2_rd_trace *lt, lxtint32_t facidx);
+ _LXT2_RD_INLINE int		lxt2_rd_clr_fac_process_mask(struct lxt2_rd_trace *lt, lxtint32_t facidx);
+-_LXT2_RD_INLINE int		lxt2_rd_set_fac_process_mask_all(struct lxt2_rd_trace *lt);
++int				lxt2_rd_set_fac_process_mask_all(struct lxt2_rd_trace *lt);
+ _LXT2_RD_INLINE int		lxt2_rd_clr_fac_process_mask_all(struct lxt2_rd_trace *lt);
+ 
+ 				/* null value_change_callback calls an empty dummy function */