From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 7 Oct 2011 08:10:18 +0000 (+0200)
Subject: Split version into separate include fio
X-Git-Tag: fio-1.99.2~3
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=89cf1480594858ad4e02499834c04fe48ff0a89d;p=fio.git

Split version into separate include fio

Include it from the Windows version file, at least we only have
to update the version in two places now instead of three.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/fio.h b/fio.h
index cfd928ce..ba680675 100644
--- a/fio.h
+++ b/fio.h
@@ -16,10 +16,6 @@
 
 struct thread_data;
 
-#define FIO_MAJOR	1
-#define FIO_MINOR	99
-#define FIO_PATCH	1
-
 #include "compiler/compiler.h"
 #include "flist.h"
 #include "fifo.h"
diff --git a/fio_version.h b/fio_version.h
new file mode 100644
index 00000000..487c9af5
--- /dev/null
+++ b/fio_version.h
@@ -0,0 +1,8 @@
+#ifndef FIO_VERSION_H
+#define FIO_VERSION_H
+
+#define FIO_MAJOR	1
+#define FIO_MINOR	99
+#define FIO_PATCH	1
+
+#endif
diff --git a/init.c b/init.c
index 5c4441d6..e3ff39c0 100644
--- a/init.c
+++ b/init.c
@@ -23,6 +23,8 @@
 
 #include "lib/getopt.h"
 
+#include "fio_version.h"
+
 #if FIO_PATCH > 0
 static char fio_version_string[] =	__fio_stringify(FIO_MAJOR) "."	\
 					__fio_stringify(FIO_MINOR) "."	\
diff --git a/os/windows/version.h b/os/windows/version.h
index 1fd1ab58..d8f4602f 100644
--- a/os/windows/version.h
+++ b/os/windows/version.h
@@ -1,4 +1,6 @@
-#define FIO_VERSION_MAJOR 1
-#define FIO_VERSION_MINOR 99
-#define FIO_VERSION_BUILD 1
+#include "../../fio_version.h"
+
+#define FIO_VERSION_MAJOR FIO_MAJOR
+#define FIO_VERSION_MINOR FIO_MINOR
+#define FIO_VERSION_BUILD FIO_PATCH
 #define FIO_VERSION_STRING "1.99.1"
diff --git a/server.c b/server.c
index 61bbe44e..c3502cd1 100644
--- a/server.c
+++ b/server.c
@@ -22,6 +22,8 @@
 #include "crc/crc16.h"
 #include "ieee754.h"
 
+#include "fio_version.h"
+
 int fio_net_port = 8765;
 
 int exit_backend = 0;