From: Michael Altizer (mialtize) <mialtize@cisco.com>
Date: Mon, 22 Oct 2018 17:17:24 +0000 (-0400)
Subject: Merge pull request #1398 in SNORT/snort3 from register_warning to master
X-Git-Tag: 3.0.0-249~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=721b54b5b7dbddf1f225f6fb9bc9a4eaee8c3e2f;p=thirdparty%2Fsnort3.git

Merge pull request #1398 in SNORT/snort3 from register_warning to master

Squashed commit of the following:

commit f46580d41a6c6cf9651159e48bc0da02972c68bc
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Mon Oct 22 13:06:33 2018 -0400

    utils: fixed deprecation build warning on register keyword
---

diff --git a/src/utils/util.h b/src/utils/util.h
index 2361220fc..19bf85abf 100644
--- a/src/utils/util.h
+++ b/src/utils/util.h
@@ -54,7 +54,7 @@
 void StoreSnortInfoStrings();
 int DisplayBanner();
 int gmt2local(time_t);
-void ts_print(register const struct timeval*, char*);
+void ts_print(const struct timeval*, char*);
 std::string read_infile(const char* key, const char* fname);
 void CleanupProtoNames();
 void CreatePidFile(pid_t);