From: Juergen Perlinger <perlinger@ntp.org>
Date: Mon, 1 Aug 2016 07:09:19 +0000 (+0200)
Subject: [Bug 3068] Linker warnings when building on Solaris.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27973c120fc4e4f3fe9e8c90624380a04e22e1a8;p=thirdparty%2Fntp.git

[Bug 3068] Linker warnings when building on Solaris.
 - applied patch thanks to Andrew Stormont <andyjstormont@gmail.com>

bk: 579ef59fijbJFRTT1mh2J610Qr0JDA
---

diff --git a/ChangeLog b/ChangeLog
index 0805467dc..9128e7e57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@
 * [Bug 3054] miscopt.html documents the allan intercept in seconds. SWhite.
 * [Bug 3058] fetch_timestamp() mishandles 64-bit alignment. Brian Utterback,
   JPerlinger, HStenn.
+* [Bug 3068] Linker warnings when building on Solaris. perlinger@ntp.org
+  - applied patch thanks to Andrew Stormont <andyjstormont@gmail.com>
 * Update the NEWS file for 4.2.8p8.  HStenn.
 * Fix typo in ntp-wait and plot_summary.  HStenn.
 * Make sure we have an "author" file for git imports.  HStenn.
diff --git a/libntp/audio.c b/libntp/audio.c
index 726dfa94d..3b0a0b364 100644
--- a/libntp/audio.c
+++ b/libntp/audio.c
@@ -55,7 +55,7 @@ static struct audio_device device; /* audio device ident */
 #ifdef PCM_STYLE_SOUND
 # define INIT_FILE "/etc/ntp.audio"
 int agc =	SOUND_MIXER_WRITE_RECLEV; /* or IGAIN or LINE */
-int monitor =	SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */
+int audiomonitor =     SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */
 int devmask = 0;
 int recmask = 0;
 char cf_c_dev[100], cf_i_dev[100], cf_agc[100], cf_monitor[100];
@@ -334,7 +334,7 @@ audio_init(
 		/* devmask */
 		i = mixer_name(cf_monitor, devmask);
 		if (i >= 0)
-			monitor = MIXER_WRITE(i);
+                       audiomonitor = MIXER_WRITE(i);
 		else
 			printf("monitor %s not in devmask %#x\n",
 			       cf_monitor, devmask);
@@ -412,7 +412,7 @@ audio_gain(
 # endif
 		l |= r << 8;
 		if (cf_monitor[0] != '\0')
-			rval = ioctl(ctl_fd, monitor, &l );
+                       rval = ioctl(ctl_fd, audiomonitor, &l );
 		else 
 			rval = ioctl(ctl_fd, SOUND_MIXER_WRITE_VOLUME,
 				     &l);