Merge pull request #2850 from aeolio/escapeVelocity

DL6ER · web-flow · commit 2a88e279f35e · 2026-04-15T19:56:21.000+02:00
Fix linker error when compiling w/o optimization
diff --git a/src/tools/dhcp-discover.h b/src/tools/dhcp-discover.h
@@ -20,12 +20,12 @@ int get_hardware_address(const int sock, const char *iname, unsigned char *mac);
 // Global lock used by all threads
 extern pthread_mutex_t dhcp_lock;
 
-inline void start_lock(void)
+static inline void start_lock(void)
 {
 	pthread_mutex_lock(&dhcp_lock);
 }
 
-inline void end_lock(void)
+static inline void end_lock(void)
 {
 	pthread_mutex_unlock(&dhcp_lock);
 }

Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,12 @@ int get_hardware_address(const int sock, const char iname, unsigned char mac);`
`20`	`20`	`// Global lock used by all threads`
`21`	`21`	`extern pthread_mutex_t dhcp_lock;`
`22`	`22`
`23`		`-inline void start_lock(void)`
	`23`	`+static inline void start_lock(void)`
`24`	`24`	`{`
`25`	`25`	`pthread_mutex_lock(&dhcp_lock);`
`26`	`26`	`}`
`27`	`27`
`28`		`-inline void end_lock(void)`
	`28`	`+static inline void end_lock(void)`
`29`	`29`	`{`
`30`	`30`	`pthread_mutex_unlock(&dhcp_lock);`
`31`	`31`	`}`