Index: ossp-pkg/var/ChangeLog
RCS File: /v/ossp/cvs/ossp-pkg/var/ChangeLog,v
rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/var/ChangeLog,v' 2>/dev/null
--- ChangeLog	2004/04/04 08:09:06	1.5
+++ ChangeLog	2004/04/04 09:57:10	1.6
@@ -12,6 +12,9 @@
   For less details please have a look at the NEWS file.
 
   Changes between 1.0.0 and 1.1.0 (14-Feb-2003 to 04-Apr-2004)
+
+   o Remove cast warnings related to function point passing.
+     [Ralf S. Engelschall <rse@engelschall.com>]
    
    o Bumped year in copyright messages for new year 2004.
      [Ralf S. Engelschall <rse@engelschall.com>]
Index: ossp-pkg/var/README
RCS File: /v/ossp/cvs/ossp-pkg/var/README,v
rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/var/README,v' 2>/dev/null
--- README	2004/04/04 08:07:34	1.5
+++ README	2004/04/04 09:57:10	1.6
@@ -5,7 +5,7 @@
   |_|_|_|  \___/|____/____/|_|       \_/ \__,_|_|
 
   OSSP var - Variable Expansion
-  Version 1.0.0 (14-Feb-2003)
+  Version 1.1.0 (04-Apr-2004)
 
   ABSTRACT
 
Index: ossp-pkg/var/VERSION
RCS File: /v/ossp/cvs/ossp-pkg/var/VERSION,v
rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/var/VERSION,v' 2>/dev/null
--- VERSION	2003/02/14 21:17:07	1.5
+++ VERSION	2004/04/04 09:57:10	1.6
@@ -2,5 +2,5 @@
   VERSION -- Version Information for OSSP var (syntax: Text)
   [automatically generated and maintained by GNU shtool]
 
-  This is OSSP var, Version 1.0.0 (14-Feb-2003)
+  This is OSSP var, Version 1.1.0 (04-Apr-2004)
 
Index: ossp-pkg/var/aclocal.m4
RCS File: /v/ossp/cvs/ossp-pkg/var/aclocal.m4,v
rcsdiff -q -kk '-r1.10' '-r1.11' -u '/v/ossp/cvs/ossp-pkg/var/aclocal.m4,v' 2>/dev/null
--- aclocal.m4	2004/04/04 08:07:34	1.10
+++ aclocal.m4	2004/04/04 09:57:10	1.11
@@ -288,7 +288,7 @@
 m4_define(__va_copy_check, [
     AH_VERBATIM($1,
 [/* Predefined possible va_copy() implementation (id: $1) */
-#define __VA_COPY_USE_$1 $2])
+#define __VA_COPY_USE_$1(d, s) $2])
     if test ".$ac_cv_va_copy" = .; then
         AC_TRY_RUN(__va_copy_test($2), [ac_cv_va_copy="$1"])
     fi
@@ -302,17 +302,21 @@
   AC_CACHE_VAL(ac_cv_va_copy, [
     ac_cv_va_copy=""
     dnl #   1. check for standardized C99 macro
-    __va_copy_check(STD, [va_copy((d), (s))])
+    __va_copy_check(C99, [va_copy((d), (s))])
     dnl #   2. check for alternative/deprecated GCC macro
-    __va_copy_check(MAC, [VA_COPY((d), (s))])
-    dnl #   3. check for assignment approach (assuming va_list is a struct)
-    __va_copy_check(AS1, [do { (d) = (s); } while (0)])
-    dnl #   4. check for assignment approach (assuming va_list is a pointer)
-    __va_copy_check(AS2, [do { *(d) = *(s); } while (0)])
-    dnl #   5. check for memory copying approach (assuming va_list is a struct)
-    __va_copy_check(CP1, [memcpy((void *)&(d), (void *)&(s)), sizeof((s))])
-    dnl #   6. check for memory copying approach (assuming va_list is a pointer)
-    __va_copy_check(CP2, [memcpy((void *)(d), (void *)(s)), sizeof(*(s))])
+    __va_copy_check(GCM, [VA_COPY((d), (s))])
+    dnl #   3. check for internal GCC macro (high-level define)
+    __va_copy_check(GCH, [__va_copy((d), (s))])
+    dnl #   4. check for internal GCC macro (built-in function)
+    __va_copy_check(GCB, [__builtin_va_copy((d), (s))])
+    dnl #   5. check for assignment approach (assuming va_list is a struct)
+    __va_copy_check(ASS, [do { (d) = (s); } while (0)])
+    dnl #   6. check for assignment approach (assuming va_list is a pointer)
+    __va_copy_check(ASP, [do { *(d) = *(s); } while (0)])
+    dnl #   7. check for memory copying approach (assuming va_list is a struct)
+    __va_copy_check(CPS, [memcpy((void *)&(d), (void *)&(s)), sizeof((s))])
+    dnl #   8. check for memory copying approach (assuming va_list is a pointer)
+    __va_copy_check(CPP, [memcpy((void *)(d), (void *)(s)), sizeof(*(s))])
     if test ".$ac_cv_va_copy" = .; then
         AC_ERROR([no working implementation found])
     fi
Index: ossp-pkg/var/devtool.conf
RCS File: /v/ossp/cvs/ossp-pkg/var/devtool.conf,v
rcsdiff -q -kk '-r1.9' '-r1.10' -u '/v/ossp/cvs/ossp-pkg/var/devtool.conf,v' 2>/dev/null
--- devtool.conf	2004/03/19 14:55:52	1.9
+++ devtool.conf	2004/04/04 09:57:10	1.10
@@ -4,7 +4,7 @@
 
 %autogen
     @autogen shtool   1.6.2 "1.6.*" all
-    @autogen libtool  1.5.2 "1.5*"
+    @autogen libtool  1.5.4 "1.5*"
     @autogen autoconf 2.59  "2.5[4-9]*"
 
 %autoclean
Index: ossp-pkg/var/var.c
RCS File: /v/ossp/cvs/ossp-pkg/var/var.c,v
rcsdiff -q -kk '-r1.103' '-r1.104' -u '/v/ossp/cvs/ossp-pkg/var/var.c,v' 2>/dev/null
--- var.c	2004/04/04 08:07:34	1.103
+++ var.c	2004/04/04 09:57:10	1.104
@@ -2467,7 +2467,7 @@
         case VAR_CONFIG_CB_VALUE: {
             var_cb_value_t fct;
             void *ctx;
-            fct = (var_cb_value_t)va_arg(ap, void *);
+            fct = (var_cb_value_t)va_arg(ap, var_cb_value_t);
             ctx = (void *)va_arg(ap, void *);
             var->cb_value_fct = fct;
             var->cb_value_ctx = ctx;
@@ -2476,7 +2476,7 @@
         case VAR_CONFIG_CB_OPERATION: {
             var_cb_operation_t fct;
             void *ctx;
-            fct = (var_cb_operation_t)va_arg(ap, void *);
+            fct = (var_cb_operation_t)va_arg(ap, var_cb_operation_t);
             ctx = (void *)va_arg(ap, void *);
             var->cb_operation_fct = fct;
             var->cb_operation_ctx = ctx;