[Getdata-commits] SF.net SVN: getdata:[834] trunk/defile

[<ket...@us...>]

Revision: 834
          http://sourceforge.net/p/getdata/code/834
Author:   ketiltrout
Date:     2013-06-21 17:19:05 +0000 (Fri, 21 Jun 2013)
Log Message:
-----------
Update for GetData-0.8.4.

Modified Paths:
--------------
    trunk/defile/bin/Makefile.am
    trunk/defile/bin/net.c
    trunk/defile/configure.ac
    trunk/defile/lib/libdefile.c

Modified: trunk/defile/bin/Makefile.am
===================================================================
--- trunk/defile/bin/Makefile.am	2013-05-15 00:57:18 UTC (rev 833)
+++ trunk/defile/bin/Makefile.am	2013-06-21 17:19:05 UTC (rev 834)
@@ -24,4 +24,4 @@
 AM_CPPFLAGS = ${GETDATA_CFLAGS} \
 							-DDEFILE_MODULEDIR="\"${moduledir}\"" ${LTDLINCL}
 defile_SOURCES = defile.c rc.c net.c rc.h
-defile_LDADD = ../lib/libdefile.la -lltdl
+defile_LDADD = ../lib/libdefile.la -lltdl ${GETDATA_LIBS}

Modified: trunk/defile/bin/net.c
===================================================================
--- trunk/defile/bin/net.c	2013-05-15 00:57:18 UTC (rev 833)
+++ trunk/defile/bin/net.c	2013-06-21 17:19:05 UTC (rev 834)
@@ -555,7 +555,7 @@
               case 7:
                 DF_GET_DATUM(E.scalar_ind[0], uint32);
               case 8:
-                DF_GET_DATUM(E.count_max, int32);
+                DF_GET_DATUM(E.period, int32);
               case 9:
                 DF_GET_SDATUM(E.scalar[1]);
               case 10:

Modified: trunk/defile/configure.ac
===================================================================
--- trunk/defile/configure.ac	2013-05-15 00:57:18 UTC (rev 833)
+++ trunk/defile/configure.ac	2013-06-21 17:19:05 UTC (rev 834)
@@ -136,7 +136,7 @@
 echo
 echo "*** Checking for external libraries"
 echo
-PKG_CHECK_MODULES([GETDATA], [getdata >= 0.8.1])
+PKG_CHECK_MODULES([GETDATA], [getdata >= 0.8.4])
 AC_SEARCH_LIBS([exp],[m])
 AC_SEARCH_LIBS([pthread_create],[pthread])
 

Modified: trunk/defile/lib/libdefile.c
===================================================================
--- trunk/defile/lib/libdefile.c	2013-05-15 00:57:18 UTC (rev 833)
+++ trunk/defile/lib/libdefile.c	2013-06-21 17:19:05 UTC (rev 834)
@@ -172,7 +172,7 @@
             || df_rpc_push_int32(slug, E->count_val)
             || df_rpc_push_string(slug, E->scalar[0])
             || df_rpc_push_uint32(slug, E->scalar_ind[0])
-            || df_rpc_push_int32(slug, E->count_max)
+            || df_rpc_push_int32(slug, E->period)
             || df_rpc_push_string(slug, E->scalar[1])
             || df_rpc_push_uint32(slug, E->scalar_ind[1]);
           break;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.