Misc build related fixes #206
Conversation
codenav/src/utils.c
Outdated
| @@ -19,7 +19,7 @@ | |||
| * along with this program; if not, see <http://www.gnu.org/licenses/>. | |||
| */ | |||
|
|
|||
| #include "utils.h" | |||
There was a problem hiding this comment.
don't remove this, it's the include for the plugin's utils.h, aka this file's header
|
OK, technically most are good, but why are they needed (but the |
| @@ -26,7 +26,7 @@ | |||
| * \brief it is the graphical user interface of the geany miniscript plugin | |||
| */ | |||
| #include "config.h" | |||
| #include "geany.h" | |||
| #include "geanyplugin.h" | |||
|
|
|||
There was a problem hiding this comment.
This change fixes
CC gms_gui.lo
In file included from gms_gui.c:57:0:
gms.h:30:8: error: unknown type name 'GeanyFunctions'
extern GeanyFunctions *geany_functions;
+#include "geanyfunctions.h" would also work but geanyplugin.h is recommended anyway
There was a problem hiding this comment.
I do not get that error if I build from current master.
Needed to compile against Geany's linkage-cleanup branch but they are good changes regardless.
| @@ -19,6 +19,8 @@ | |||
| * along with this program; if not, see <http://www.gnu.org/licenses/>. | |||
| */ | |||
|
|
|||
| #include <geanyplugin.h> | |||
|
|
|||
| #include "utils.h" | |||
|
|
|||
There was a problem hiding this comment.
As an alternative one could replace the inappropriate use of utils_str_equal with g_strcmp/0 but i dont like to potentially change the behavior now
|
I'm planning to merge the changes only if referenced Geany changes are getting merged. |
|
These changes don't depend on the Geany changes. They should be applied either way
|
| @@ -26,7 +26,7 @@ | |||
| * \brief it is the graphical user interface of the geany miniscript plugin | |||
| */ | |||
| #include "config.h" | |||
| #include "geany.h" | |||
| #include "geanyplugin.h" | |||
|
OK, so now I ignored this one when I committed 2d1dee0 and 856b3d9, this "only" "fixes" plugins "incorrectly" including something else than And if we do that, maybe there are more plugins to fix? :) |
|
I fixed all usages of |
|
Makes sense, feel free. |
|
Closing in favor of all changes done separately in other PRs. |
Needed to compile against Geany's linkage-cleanup branch but they
are good changes regardless.