Send inn-committers mailing list submissions to
        inn-committers@lists.isc.org

To subscribe or unsubscribe via the World Wide Web, visit
        https://lists.isc.org/mailman/listinfo/inn-committers
or, via email, send a message with subject or body 'help' to
        inn-committers-requ...@lists.isc.org

You can reach the person managing the list at
        inn-committers-ow...@lists.isc.org

When replying, please edit your Subject line so it is more specific
than "Re: Contents of inn-committers digest..."


Today's Topics:

   1. INN commit: trunk/innfeed (configfile.l) (INN Commit)
   2. INN commit: trunk/tests (Makefile) (INN Commit)


----------------------------------------------------------------------

Message: 1
Date: Wed,  7 Aug 2013 11:37:37 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk/innfeed (configfile.l)
Message-ID: <20130807183737.a4d0167...@hope.eyrie.org>

    Date: Wednesday, August 7, 2013 @ 11:37:37
  Author: iulius
Revision: 9526

do not use yyget_leng() function as it is not defined by old flex versions

Better keep using yyleng, still cast to size_t.

Modified:
  trunk/innfeed/configfile.l

--------------+
 configfile.l |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Modified: configfile.l
===================================================================
--- configfile.l        2013-08-06 21:31:03 UTC (rev 9525)
+++ configfile.l        2013-08-07 18:37:37 UTC (rev 9526)
@@ -151,9 +151,11 @@
 
        for (i = 1, strIdx = 0, sawBsl = 0 ; ; i++)
           {
-            /* Cast yyget_leng() to size_t because it used to be an int
-             * in flex versions anterior to 2.5.35 (not included). */
-            if (i < (size_t) yyget_leng())
+            /* Cast yyleng to size_t because it used to be an int
+             * in flex versions anterior or equal to 2.5.35.
+             * Do not use yyget_leng() here because old flex versions
+             * do not define it. */
+            if (i < (size_t) yyleng)
               current = yytext [i] ;
             else
               current = input() ;



------------------------------

Message: 2
Date: Thu,  8 Aug 2013 01:32:50 -0700 (PDT)
From: INN Commit <r...@isc.org>
To: inn-committ...@isc.org
Subject: INN commit: trunk/tests (Makefile)
Message-ID: <20130808083250.c149867...@hope.eyrie.org>

    Date: Thursday, August 8, 2013 @ 01:32:50
  Author: iulius
Revision: 9527

test suite:  add libm for linking

On some platforms (like AIX), linking with libm is needed as the test
suite uses math functions.  Though only lib/confparse-t.c currently
uses is_double()/ok_double(), add libm to the whole test suite.

Updating to the latest release of Russ' C TAP Harness will make it
possible to link with libm only for the relevant tests.

Modified:
  trunk/tests/Makefile

----------+
 Makefile |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Modified: Makefile
===================================================================
--- Makefile    2013-08-07 18:37:37 UTC (rev 9526)
+++ Makefile    2013-08-08 08:32:50 UTC (rev 9527)
@@ -6,6 +6,10 @@
 RUNTESTS_CFLAGS        = -DSOURCE='"$(abs_builddir)/tests"' 
-DBUILD='"$(abs_builddir)/tests"'
 CFLAGS         = $(GCFLAGS) $(DB_CPPFLAGS) $(DBM_CPPFLAGS) $(PERL_CPPFLAGS) 
$(PYTHON_CPPFLAGS) $(SSL_CPPFLAGS) $(SASL_CPPFLAGS) $(KRB5_CPPFLAGS) 
$(RUNTESTS_CFLAGS) -I.
 
+##  On some platforms, linking with libm is needed as the test suite uses
+##  math functions (currently only lib/confparse-t.c).
+LIBM_LDFLAGS    = '-lm'
+
 ##  The tests that need to be built.  Tests in the form of shell scripts
 ##  or some other form that doesn't require compiling shouldn't be in this
 ##  list.  If they need other things compiled, those other things should be
@@ -45,7 +49,7 @@
 .c.o: $*.c
        $(CC) $(CFLAGS) -c -o $@ $*.c
 
-LINK           = $(LIBTOOLLD) $(CC) $(LDFLAGS) $(DB_LDFLAGS) $(SSL_LDFLAGS) 
$(SASL_LDFLAGS) $(KRB5_LDFLAGS) -o $@
+LINK           = $(LIBTOOLLD) $(CC) $(LDFLAGS) $(LIBM_LDFLAGS) $(DB_LDFLAGS) 
$(SSL_LDFLAGS) $(SASL_LDFLAGS) $(KRB5_LDFLAGS) -o $@
 STORAGEDEPS    = $(LIBSTORAGE) $(LIBHIST) $(LIBINN)
 STORAGELIBS    = $(STORAGEDEPS) $(STORAGE_LIBS)
 



------------------------------

_______________________________________________
inn-committers mailing list
inn-committers@lists.isc.org
https://lists.isc.org/mailman/listinfo/inn-committers

End of inn-committers Digest, Vol 54, Issue 4
*********************************************

Reply via email to