<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en" style='--code-editor-font: var(--default-mono-font, "GitLab Mono"), JetBrains Mono, Menlo, DejaVu Sans Mono, Liberation Mono, Consolas, Ubuntu Mono, Courier New, andale mono, lucida console, monospace;'>
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style data-premailer="ignore" type="text/css">
a { color: #1068bf; }
</style>
<style>img {
max-width: 100%; height: auto;
}
body {
font-size: 0.875rem;
}
body {
-webkit-text-shadow: rgba(255,255,255,0.01) 0 0 1px;
}
body {
font-family: var(--default-regular-font, "GitLab Sans"),-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; font-size: inherit;
}
</style>
</head>
<body style='font-size: inherit; -webkit-text-shadow: rgba(255,255,255,0.01) 0 0 1px; font-family: var(--default-regular-font, "GitLab Sans"),-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Noto Sans",Ubuntu,Cantarell,"Helvetica Neue",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";'>
<div class="content">
<p style="color: #777777;">
<a href="https://gitlab.com/lazka">Christoph Reiter</a>
<a href="https://gitlab.com/gnutls/gnutls/-/issues/1497#note_1513866196">commented</a>:
</p>
<div class="md" style="color: #333238; word-wrap: break-word;">
<p dir="auto" style="color: #333238; margin: 0 0 16px;" align="initial">I've worked this around now downstream, by just dropping that conflicting declaration:</p>
<div class="gl-relative markdown-code-block js-markdown-code">
<pre data-canonical-lang="diff" class="code highlight js-syntax-highlight language-diff" lang="diff" v-pre="true" style='display: block; font-size: 14px; color: #333238; line-height: 1.6em; overflow-x: auto; border-radius: 4px; position: relative; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; word-break: break-all; word-wrap: break-word; background-color: #fbfafd; margin: 0 0 16px; padding: 12px; border: 1px solid #dcdcde;'><code style='font-size: 0.875rem; color: inherit; word-wrap: normal; word-break: keep-all; background-color: inherit; border-radius: 4px; white-space: pre; margin-top: 0; font-family: var(--default-mono-font, "GitLab Mono"),"JetBrains Mono","Menlo","DejaVu Sans Mono","Liberation Mono","Consolas","Ubuntu Mono","Courier New","andale mono","lucida console",monospace; overflow-wrap: normal; padding: unset;'><span id="LC1" class="line" lang="diff" style="margin-top: 0;"><span class="gd" style="margin-top: 0;">--- gnutls-3.8.1/src/benchmark.h.orig 2023-08-15 12:08:01.059509200 +0200</span></span>
<span id="LC2" class="line" lang="diff"><span class="gi" style="margin-top: 0;">+++ gnutls-3.8.1/src/benchmark.h 2023-08-15 12:10:19.840993900 +0200</span></span>
<span id="LC3" class="line" lang="diff"><span class="p" style="margin-top: 0;">@@ -31,19 +31,6 @@</span></span>
<span id="LC4" class="line" lang="diff"> #include <stdint.h></span>
<span id="LC5" class="line" lang="diff"> #include "timespec.h"</span>
<span id="LC6" class="line" lang="diff"> </span>
<span id="LC7" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_PROCESS_CPUTIME_ID)</span></span>
<span id="LC8" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-#undef gettime</span></span>
<span id="LC9" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-#define gettime(x) clock_gettime(CLOCK_PROCESS_CPUTIME_ID, x)</span></span>
<span id="LC10" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-#else</span></span>
<span id="LC11" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-inline static void gettime(struct timespec *ts)</span></span>
<span id="LC12" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-{</span></span>
<span id="LC13" class="line" lang="diff"><span class="gd" style="margin-top: 0;">- struct timeval tv;</span></span>
<span id="LC14" class="line" lang="diff"><span class="gd" style="margin-top: 0;">- gettimeofday(&tv, NULL);</span></span>
<span id="LC15" class="line" lang="diff"><span class="gd" style="margin-top: 0;">- ts->tv_sec = tv.tv_sec;</span></span>
<span id="LC16" class="line" lang="diff"><span class="gd" style="margin-top: 0;">- ts->tv_nsec = tv.tv_usec * 1000;</span></span>
<span id="LC17" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-}</span></span>
<span id="LC18" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-#endif</span></span>
<span id="LC19" class="line" lang="diff"><span class="gd" style="margin-top: 0;">-</span></span>
<span id="LC20" class="line" lang="diff"> typedef void (*sighandler_t)(int);</span>
<span id="LC21" class="line" lang="diff"> </span>
<span id="LC22" class="line" lang="diff"> void benchmark_cipher(int debug_level);</span></code></pre>
<copy-code></copy-code>
</div>
<p dir="auto" style="color: #333238; margin: 0;" align="initial">though the gnulib variant doesn't use CLOCK_PROCESS_CPUTIME_ID, so it's not 100% equivalent. <a href="https://git.savannah.gnu.org/cgit/gnulib.git/tree/lib/gettime.c" rel="nofollow noreferrer noopener" target="_blank" style="margin-top: 0;">https://git.savannah.gnu.org/cgit/gnulib.git/tree/lib/gettime.c</a></p>
</div>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #737278;">
—
<br>
Reply to this email directly or <a href="https://gitlab.com/gnutls/gnutls/-/issues/1497#note_1513866196">view it on GitLab</a>.
<br>
You're receiving this email because of your account on <a target="_blank" rel="noopener noreferrer" href="https://gitlab.com">gitlab.com</a>. <a href="https://gitlab.com/-/sent_notifications/a3b8e652a51ee1e295993e67daae289e/unsubscribe" target="_blank" rel="noopener noreferrer">Unsubscribe</a> from this thread · <a href="https://gitlab.com/-/profile/notifications" target="_blank" rel="noopener noreferrer" class="mng-notif-link">Manage all notifications</a> · <a href="https://gitlab.com/help" target="_blank" rel="noopener noreferrer" class="help-link">Help</a>
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Issue","url":"https://gitlab.com/gnutls/gnutls/-/issues/1497#note_1513866196"}}</script>
</p>
</div>
</body>
</html>