Get rid of mixed code/data sections

[fio.git] / fio.h

diff --git a/fio.h b/fio.h
index d5746dd4453bb42de63ca581d5969b769d5fbcb4..50a868ad71704407f33a09161c1d8b3aff4a5100 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -14,8 +14,6 @@
 #include <inttypes.h>
 #include <assert.h>
 
-struct thread_data;
-
 #include "compiler/compiler.h"
 #include "thread_options.h"
 #include "flist.h"
@@ -323,9 +321,9 @@ enum {
 
 #define __td_verror(td, err, msg, func)                                        \
        do {                                                            \
+               int e = (err);                                          \
                if ((td)->error)                                        \
                        break;                                          \
-               int e = (err);                                          \
                (td)->error = e;                                        \
                if (!(td)->first_error)                                 \
                        snprintf(td->verror, sizeof(td->verror), "file:%s:%d, func=%s, error=%s", __FILE__, __LINE__, (func), (msg));           \
@@ -471,13 +469,6 @@ extern int is_blktrace(const char *);
 extern int load_blktrace(struct thread_data *, const char *);
 #endif
 
-/*
- * Mark unused variables passed to ops functions as unused, to silence gcc
- */
-#define fio_unused     __attribute((__unused__))
-#define fio_init       __attribute__((constructor))
-#define fio_exit       __attribute__((destructor))
-
 #define for_each_td(td, i)     \
        for ((i) = 0, (td) = &threads[0]; (i) < (int) thread_number; (i)++, (td)++)
 #define for_each_file(td, f, i)        \