[Bug3608] libparse fails to compile on S11.4SRU13 and later

bk: 5d5b94faEaGWN88FFs0dCXKUnsZR4g

diff --git a/ChangeLog b/ChangeLog
index a796d737c88f463f632656f9ca945363539014d4..64f404a51e0b9f1d65a26468a4e7cc536391491e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 ---
 
+* [Bug 3608] libparse fails to compile on S11.4SRU13 and later <perlinger@ntp.org>
+  - removed ffs() and fls() prototypes as per Brian Utterback
 * [Bug 3604] Wrong param byte order passing into record_raw_stats() in
        ntp_io.c <perlinger@ntp.org>
   - fixed byte and paramter order as suggested by wei6410@sina.com 

diff --git a/libparse/Makefile.am b/libparse/Makefile.am
index 41528a76bd79f6a6ee77b114a3835da056124167..8fb089f7717f6d80337b85703c1d3c35686b7389 100644 (file)
--- a/libparse/Makefile.am
+++ b/libparse/Makefile.am
@@ -164,9 +164,11 @@ parse: $(parsesolaris_OBJECTS) libparse_kernel.a ../libntp/libntp.a
 
 parsesolaris.o: sys/systm.h
 
+# [Bug3608] Solaris has inconsistent definitions of ffs() and fls(). Drop the
+# ones from 'systm.h'.
 sys/systm.h:
        -mkdir sys
-       sed -e '/ffs(.*)/d' < /usr/include/sys/systm.h > sys/systm.h
+       sed -e '/f[fl]s(.*)/d' < /usr/include/sys/systm.h > sys/systm.h
 
 ## check-libparse is invoked by ntpd/Makefile.am
 check-libparse: $(noinst_LIBRARIES)