Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1169

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1166-7-9

bk: 49f7404bBNo8LdDsuC1ir8bSFeqA1w

diff --cc ChangeLog
index 711086f87c632b61e025e3de9be485ab8e023791,e4d7b5a043e5004a47c8c6b7aa8eb0b9f5844176..fa4505f7209401cf76c5283cef6842f017291cca
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,7 +1,9 @@@
+ * [Bug 1169] quiet compiler warnings
+ * Re-enable gcc -Wstrict-prototypes when not building with OpenSSL
+ * Enable gcc -Wstrict-overflow
+ * ntpq/ntpdc emit newline after accepting password on Windows
 +* m4/ntp_lineeditlibs.m4: fix warnings from newer Autoconf
 +* Remove truncation of position (blanking) code in refclock_nmea.c
  (4.2.5p167) 2009/04/26 Released by Harlan Stenn <stenn@ntp.org>
  * Crypto cleanup from Dave Mills.
  (4.2.5p166) 2009/04/25 Released by Harlan Stenn <stenn@ntp.org>

diff --cc configure.ac
index 80b9e32f3045dcadf133300ed493662e53527207,373742b10e235f8325810201346f151c5a41e70e..20b33a7db56e7af6d7a966d5b9645c6b353e49d5
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -284,27 -255,14 +284,17 @@@ case "$GCC" i
      CFLAGS="$CFLAGS -Wmissing-prototypes"
      CFLAGS="$CFLAGS -Wpointer-arith"
      CFLAGS="$CFLAGS -Wshadow"
-     #
-     # OpenSSL has a number of callback prototypes
-     # inside other function prototypes which trigger
-     # warnings with -Wstrict-prototypes, such as:
-     #
-     # int i2d_RSA_NET(const RSA *a, unsigned char **pp, 
-     #                 int (*cb)(), int sgckey);
-     #                 ^^^^^^^^^^^
-     #
-     CFLAGS="$CFLAGS -Wno-strict-prototypes"
      # CFLAGS="$CFLAGS -Wtraditional"
      # CFLAGS="$CFLAGS -Wwrite-strings"
 -    CFLAGS="$CFLAGS -Winit-self"
 +    case "$ac_cv_gcc_Winit_self" in
 +     yes)
 +      CFLAGS="$CFLAGS -Winit-self"
 +    esac
      case "$ac_cv_gcc_Wstrict_overflow" in
       yes)
-       #not yet: CFLAGS="$CFLAGS -Wstrict-overflow"
+       CFLAGS="$CFLAGS -Wstrict-overflow"
      esac
-     ;;
+     # if building with OpenSSL, -Wno-strict-prototypes is added later
  esac
  
  case "$host" in