<html lang='en'>
<head>
<meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
<title>
GitLab
</title>
</meta>
</head>
<style>
img {
max-width: 100%;
height: auto;
}
p.details {
font-style:italic;
color:#777
}
.footer p {
font-size:small;
color:#777
}
pre.commit-message {
white-space: pre-wrap;
}
.file-stats a {
text-decoration: none;
}
.file-stats .new-file {
color: #090;
}
.file-stats .deleted-file {
color: #B00;
}
</style>
<body>
<div class='content'>
<h3>Amar Takhar pushed to branch master at <a href="https://gitlab.com/NTPsec/ntpsec">NTPsec / ntpsec</a></h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/0bdf7bc7850ab7b9fa83c7a4b7abd61198b59402">0bdf7bc7</a></strong>
<div>
<span>by Amar Takhar</span>
<i>at 2015-12-07T13:49:21Z</i>
</div>
<pre class='commit-message'>Only build Audio refclocks when OSS is available.
Fixes #25</pre>
</li>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/24fe0ff7cb9d10ed9ed7c9843ddfe7ce4e70a84f">24fe0ff7</a></strong>
<div>
<span>by Amar Takhar</span>
<i>at 2015-12-07T13:52:12Z</i>
</div>
<pre class='commit-message'>Fix #pragmas in msyslog.c
This checks for __clang__ and falls down to GCC pragmas. This is not ideal once
we get into other compilers I'll work on something more general for compiler
detection.
Fixes #29</pre>
</li>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/2508258fa955044040d2e9c21d3893fd659ef577">2508258f</a></strong>
<div>
<span>by Amar Takhar</span>
<i>at 2015-12-07T13:54:01Z</i>
</div>
<pre class='commit-message'>Fix spelling mistake.
Fixes #30
Submitted by: Matt Selsky</pre>
</li>
</ul>
<h4>5 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
libntp/wscript
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
pylib/check_libevent2.py
</a>
</li>
<li class='file-stats'>
<a href='#diff-2'>
pylib/configure.py
</a>
</li>
<li class='file-stats'>
<a href='#diff-3'>
pylib/refclock.py
</a>
</li>
<li class='file-stats'>
<a href='#diff-4'>
tests/libntp/msyslog.c
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/813f50ee4285d17350c306fa8b3a4369d6dd2018...2508258fa955044040d2e9c21d3893fd659ef577#diff-0'>
<strong>
libntp/wscript
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/libntp/wscript
</span><span style="color: #000000;background-color: #ddffdd">+++ b/libntp/wscript
</span><span style="color: #aaaaaa">@@ -54,8 +54,7 @@ def build(ctx):
</span> "ymd2yd.c",
]
<span style="color: #000000;background-color: #ffdddd">- if ctx.env.REFCLOCK_CHU == True \
- or ctx.env.REFCLOCK_IRIG == True:
</span><span style="color: #000000;background-color: #ddffdd">+ if ctx.env.AUDIO_ENABLE:
</span>
libntp_source += [
"audio.c"
</code></pre>
<br>
</li>
<li id='diff-1'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/813f50ee4285d17350c306fa8b3a4369d6dd2018...2508258fa955044040d2e9c21d3893fd659ef577#diff-1'>
<strong>
pylib/check_libevent2.py
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/pylib/check_libevent2.py
</span><span style="color: #000000;background-color: #ddffdd">+++ b/pylib/check_libevent2.py
</span><span style="color: #aaaaaa">@@ -43,7 +43,7 @@ def check_libevent2(ctx):
</span> print("")
pprint("RED", "Warning libevent2 does not work")
pprint("RED", "This means ntpdig will not be built")
<span style="color: #000000;background-color: #ffdddd">- pprint("RED", "While not nessicary you will lose 'ntpdate' functionality.")
</span><span style="color: #000000;background-color: #ddffdd">+ pprint("RED", "While not necessary you will lose 'ntpdate' functionality.")
</span> print("")
else:
ctx.env.LIBEVENT2_ENABLE=True
</code></pre>
<br>
</li>
<li id='diff-2'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/813f50ee4285d17350c306fa8b3a4369d6dd2018...2508258fa955044040d2e9c21d3893fd659ef577#diff-2'>
<strong>
pylib/configure.py
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/pylib/configure.py
</span><span style="color: #000000;background-color: #ddffdd">+++ b/pylib/configure.py
</span><span style="color: #aaaaaa">@@ -456,6 +456,12 @@ def cmd_configure(ctx):
</span>
ctx.define("DIR_SEP", "'%s'" % sep, quote=False)
<span style="color: #000000;background-color: #ddffdd">+ # Enable audio when the right headers exist.
+ if ctx.get_define("HAVE_SYS_AUDIOIO_H") or \
+ ctx.get_define("HAVE_SYS_SOUNDCARD_H") or \
+ ctx.get_define("HAVE_MACHINE_SOUNDCARD_H"):
+ ctx.env.AUDIO_ENABLE = True
+
</span>
# libisc/
# XXX: Hack that needs to be fixed properly for all platforms
</code></pre>
<br>
</li>
<li id='diff-3'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/813f50ee4285d17350c306fa8b3a4369d6dd2018...2508258fa955044040d2e9c21d3893fd659ef577#diff-3'>
<strong>
pylib/refclock.py
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/pylib/refclock.py
</span><span style="color: #000000;background-color: #ddffdd">+++ b/pylib/refclock.py
</span><span style="color: #aaaaaa">@@ -30,12 +30,14 @@ refclock_map = {
</span> 6: {
"descr": "IRIG Audio Decoder",
"define": "CLOCK_IRIG",
<span style="color: #000000;background-color: #ddffdd">+ "require": ["audio"],
</span> "file": "irig"
},
7: {
"descr": "Radio CHU Audio Demodulator/Decoder",
"define": "CLOCK_CHU",
<span style="color: #000000;background-color: #ddffdd">+ "require": ["audio"],
</span> "file": "chu"
},
<span style="color: #aaaaaa">@@ -236,6 +238,13 @@ def refclock_config(ctx):
</span> pprint("RED", "Refclock \"%s\" disabled, PPS API has not been detected as working." % rc["descr"])
continue
<span style="color: #000000;background-color: #ddffdd">+ if "audio" in rc["require"]:
+ if not ctx.env.AUDIO_ENABLE:
+ ctx.end_msg("No")
+ pprint("RED", "Refclock \"%s\" disabled, Audio (OSS) support is not available." % rc["descr"])
+ continue
+
+
</span> ctx.env.REFCLOCK_SOURCE.append((rc["file"], rc["define"]))
ctx.env["REFCLOCK_%s" % rc["file"].upper()] = True
ctx.define(rc["define"], 1)
</code></pre>
<br>
</li>
<li id='diff-4'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/813f50ee4285d17350c306fa8b3a4369d6dd2018...2508258fa955044040d2e9c21d3893fd659ef577#diff-4'>
<strong>
tests/libntp/msyslog.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/tests/libntp/msyslog.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/tests/libntp/msyslog.c
</span><span style="color: #aaaaaa">@@ -90,22 +90,20 @@ TEST(msyslog, msnprintfHangingPercent)
</span> ZERO(exp_buf);
ZERO(act_buf);
/* warning: format string contains '\0' within the string body [-Wformat] */
<span style="color: #000000;background-color: #ffdddd">-#ifdef __GNUC__
</span><span style="color: #000000;background-color: #ddffdd">+#ifdef __clang__
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wformat"
+#else /* GCC */
</span> #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-contains-nul"
#pragma GCC diagnostic ignored "-Wformat="
#pragma GCC diagnostic ignored "-Wformat"
#endif
<span style="color: #000000;background-color: #ffdddd">-#ifdef __clang__
-# pragma clang diagnostic push
-# pragma clang diagnostic ignored "-Wformat"
-#endif
</span> exp_cnt = snprintf(exp_buf, sizeof(exp_buf), "percent then nul term then non-nul %\0oops!");
act_cnt = msnprintf(act_buf, sizeof(act_buf), "percent then nul term then non-nul %\0oops!");
#ifdef __clang__
# pragma clang diagnostic pop
<span style="color: #000000;background-color: #ffdddd">-#endif
-#ifdef __GNUC__
</span><span style="color: #000000;background-color: #ddffdd">+#else
</span> #pragma GCC diagnostic pop
#endif
</code></pre>
<br>
</li>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/compare/813f50ee4285d17350c306fa8b3a4369d6dd2018...2508258fa955044040d2e9c21d3893fd659ef577">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.com.
If you'd like to receive fewer emails, you can adjust your notification settings.
</p>
</div>
</body>
</html>