bluez/log.c: Replace 'VERSION' by 'BLUEZ_VERSION_MAJOR.BLUEZ_VERSION_MINOR'

oliviermartin · oliviermartin · commit d9e67b829bd7 · 2016-05-02T19:17:06.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,8 +42,6 @@ set(gattlib_SRCS bluez/attrib/att.c
                  bluez/lib/uuid.c
                  bluez/src/log.c)
 
-add_definitions(-DVERSION="4.101")
-
 # Gattlib files
 list(APPEND gattlib_SRCS src/gattlib_connect.c
                          src/gattlib_discover.c
diff --git a/bluez/src/log.c b/bluez/src/log.c
@@ -133,7 +133,7 @@ void __btd_log_init(const char *debug, int detach)
 
 	openlog("bluetoothd", option, LOG_DAEMON);
 
-	syslog(LOG_INFO, "Bluetooth daemon %s", VERSION);
+	syslog(LOG_INFO, "Bluetooth daemon %d.%d", BLUEZ_VERSION_MAJOR, BLUEZ_VERSION_MINOR);
 }
 
 void __btd_log_cleanup(void)

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ void __btd_log_init(const char *debug, int detach)`
`133`	`133`
`134`	`134`	`openlog("bluetoothd", option, LOG_DAEMON);`
`135`	`135`
`136`		`- syslog(LOG_INFO, "Bluetooth daemon %s", VERSION);`
	`136`	`+ syslog(LOG_INFO, "Bluetooth daemon %d.%d", BLUEZ_VERSION_MAJOR, BLUEZ_VERSION_MINOR);`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`void __btd_log_cleanup(void)`