]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Merge pull request #1398 in SNORT/snort3 from register_warning to master
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Mon, 22 Oct 2018 17:17:24 +0000 (13:17 -0400)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Mon, 22 Oct 2018 17:17:24 +0000 (13:17 -0400)
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

src/utils/util.h

index 2361220fcd035547455a0b3a60d171bbfd5cae08..19bf85abf6cc72165bd18fee45c6fab24915c23b 100644 (file)
@@ -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);