summaryrefslogtreecommitdiff
path: root/include/thr_timer.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2014-10-08 08:47:22 +0200
committerSergei Golubchik <serg@mariadb.org>2014-10-10 22:27:36 +0200
commitd103e359f875e53b7e34fe0c0d58ba9f36b9af50 (patch)
tree1d04904e8dd74c5a8f725c6392a455da8cfaaa22 /include/thr_timer.h
parente6152f929369758691d863191f58d71d48b3d6c6 (diff)
downloadmariadb-git-d103e359f875e53b7e34fe0c0d58ba9f36b9af50.tar.gz
followup changes to timeout commit
* fix debian patch * update the copyright * rename include guards to follow conventions * restore incorectly deleted test file, add clarification in a comment * capitalize the first letter of the status variable
Diffstat (limited to 'include/thr_timer.h')
-rw-r--r--include/thr_timer.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/thr_timer.h b/include/thr_timer.h
index 892bbc1a01f..724fdac41c8 100644
--- a/include/thr_timer.h
+++ b/include/thr_timer.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012 Monty Program Ab
+/* Copyright (c) 2014 Monty Program Ab
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,8 +15,8 @@
/* Prototypes when using thr_timer functions */
-#ifndef _thr_timer_h
-#define _thr_timer_h
+#ifndef THR_TIMER_INCLUDED
+#define THR_TIMER_INCLUDED
#ifdef __cplusplus
extern "C" {
#endif
@@ -42,4 +42,4 @@ void thr_timer_end(thr_timer_t *timer_data);
#ifdef __cplusplus
}
#endif /* __cplusplus */
-#endif /* _thr_timer_h */
+#endif /* THR_TIMER_INCLUDED */