swanctl: Add missing `extern` for `swanctl_dir` variable in header
authorTobias Brunner <tobias@strongswan.org>
Tue, 28 Jan 2020 09:33:55 +0000 (10:33 +0100)
committerTobias Brunner <tobias@strongswan.org>
Tue, 28 Jan 2020 14:29:40 +0000 (15:29 +0100)
This clearly never was correct, but didn't cause problems so far.
However, GCC 10 will default to `-fno-common` instead of
`-fcommon` (https://gcc.gnu.org/PR85678), so compilation there fails
with something like:

```
libtool: link: gcc ... -o .libs/swanctl ...
ld: commands/load_authorities.o:strongswan/src/swanctl/./swanctl.h:33:
  multiple definition of `swanctl_dir'; commands/load_all.o:strongswan/src/swanctl/./swanctl.h:33: first defined here
```

Fixes: 501bd53a6cce ("swanctl: Make credential directories relative to swanctl.conf")
Closes strongswan/strongswan#163.

src/swanctl/swanctl.h

index f0c334f..70f70d1 100644 (file)
@@ -30,7 +30,7 @@
 /**
  * Base directory for credentials and config
  */
-char *swanctl_dir;
+extern char *swanctl_dir;
 
 /**
  * Configuration file for connections, etc.