<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>
Hal Murray 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/fc1eaf9482c1d7b3ee029427700550d2340bd5c1">fc1eaf94</a></strong>
<div>
<span>by Hal Murray</span>
<i>at 2016-02-06T10:31:19-08:00</i>
</div>
<pre class='commit-message'>Build without utmpx.h</pre>
</li>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/fa1cc41ad5b69f129d143c9f7a8ddbb532052acc">fa1cc41a</a></strong>
<div>
<span>by Hal Murray</span>
<i>at 2016-02-06T10:37:33-08:00</i>
</div>
<pre class='commit-message'>Fix typo</pre>
</li>
</ul>
<h4>2 changed files:</h4>
<ul>
<li class='file-stats'>
<a href='#diff-0'>
libntp/systime.c
</a>
</li>
<li class='file-stats'>
<a href='#diff-1'>
pylib/configure.py
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id='diff-0'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/b88776e15b23758f9413297c6359d6187e887778...fa1cc41ad5b69f129d143c9f7a8ddbb532052acc#diff-0'>
<strong>
libntp/systime.c
</strong>
</a>
<hr>
<pre class="highlight"><code><span style="color: #000000;background-color: #ffdddd">--- a/libntp/systime.c
</span><span style="color: #000000;background-color: #ddffdd">+++ b/libntp/systime.c
</span><span style="color: #aaaaaa">@@ -15,8 +15,9 @@
</span> #include "timespecops.h"
#include "ntp_calendar.h"
<span style="color: #000000;background-color: #ddffdd">+#ifdef HAVE_UTMPX_H
</span> #include <utmpx.h>
<span style="color: #000000;background-color: #ffdddd">-
</span><span style="color: #000000;background-color: #ddffdd">+#endif
</span>
#ifndef USE_COMPILETIME_PIVOT
# define USE_COMPILETIME_PIVOT 1
<span style="color: #aaaaaa">@@ -449,21 +450,22 @@ step_systime(
</span> timetv.tv_usec = timets.tv_nsec / 1000;
tvdiff = abs_tval(sub_tval(timetv, tvlast));
if (tvdiff.tv_sec > 0) {
<span style="color: #000000;background-color: #ffdddd">-#ifdef OVERRIDE_OTIME_MSG
-# define OTIME_MSG OVERRIDE_OTIME_MSG
-#else
</span><span style="color: #000000;background-color: #ddffdd">+#ifdef HAVE_UTMPX_H
+# ifdef OVERRIDE_OTIME_MSG
+# define OTIME_MSG OVERRIDE_OTIME_MSG
+# else
</span> /* Already defined on NetBSD */
<span style="color: #000000;background-color: #ffdddd">-# ifndef OTIME_MSG
-# define OTIME_MSG "Old NTP time"
</span><span style="color: #000000;background-color: #ddffdd">+# ifndef OTIME_MSG
+# define OTIME_MSG "Old NTP time"
+# endif
</span> # endif
<span style="color: #000000;background-color: #ffdddd">-#endif
-#ifdef OVERRIDE_NTIME_MSG
-# define NTIME_MSG OVERRIDE_NTIME_MSG
-#else
-# ifndef NTIME_MSG
-# define NTIME_MSG "New NTP time"
</span><span style="color: #000000;background-color: #ddffdd">+# ifdef OVERRIDE_NTIME_MSG
+# define NTIME_MSG OVERRIDE_NTIME_MSG
+# else
+# ifndef NTIME_MSG
+# define NTIME_MSG "New NTP time"
+# endif
</span> # endif
<span style="color: #000000;background-color: #ffdddd">-#endif
</span> struct utmpx utx;
ZERO(utx);
<span style="color: #aaaaaa">@@ -484,8 +486,8 @@ step_systime(
</span> endutxent();
/* Not POSIX - glibc extension */
<span style="color: #000000;background-color: #ffdddd">-#ifdef HAVE_UPDWTMPX
-#define WTMPX_FILE "/var/log/wtmp"
</span><span style="color: #000000;background-color: #ddffdd">+# ifdef HAVE_UPDWTMPX
+# define WTMPX_FILE "/var/log/wtmp"
</span> /* WTMPX */
utx.ut_type = OLD_TIME;
utx.ut_tv.tv_sec = tvlast.tv_sec;
<span style="color: #aaaaaa">@@ -497,10 +499,11 @@ step_systime(
</span> utx.ut_tv.tv_usec = timetv.tv_usec;
strlcpy(utx.ut_line, NTIME_MSG, sizeof(utx.ut_line));
updwtmpx(WTMPX_FILE, &utx);
<span style="color: #000000;background-color: #ffdddd">-#undef WTMPX_FILE
-#endif /* HAVE_UPDWTMPX */
-#undef OTIME_MSG
-#undef NTIME_MSG
</span><span style="color: #000000;background-color: #ddffdd">+# undef WTMPX_FILE
+# endif /* HAVE_UPDWTMPX */
+# undef OTIME_MSG
+# undef NTIME_MSG
+#endif
</span> }
tvlast = timetv;
return true;
</code></pre>
<br>
</li>
<li id='diff-1'>
<a href='https://gitlab.com/NTPsec/ntpsec/compare/b88776e15b23758f9413297c6359d6187e887778...fa1cc41ad5b69f129d143c9f7a8ddbb532052acc#diff-1'>
<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">@@ -343,6 +343,7 @@ def cmd_configure(ctx):
</span> #HGM "sys/systune.h",
("timepps.h", ["inttypes.h"]),
("sys/timepps.h", ["inttypes.h", "sys/time.h"]),
<span style="color: #000000;background-color: #ddffdd">+ "utmpx.h" # missing on RTEMS and OpenBSD
</span> )
for hdr in optional_headers:
if type(hdr) == type(""):
</code></pre>
<br>
</li>
</div>
<div class='footer' style='margin-top: 10px;'>
<p>
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/compare/b88776e15b23758f9413297c6359d6187e887778...fa1cc41ad5b69f129d143c9f7a8ddbb532052acc">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>