Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc build related fixes #206

Closed
wants to merge 1 commit into from
Closed

Misc build related fixes #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion codenav/src/utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/

#include <geanyplugin.h>

#include "utils.h"

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

/**
Expand Down Expand Up @@ -107,4 +109,3 @@ strrpos(const gchar *haystack, const gchar *needle)
return p - haystack;
return -1; // not found
}

1 change: 1 addition & 0 deletions devhelp/src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ devhelp_la_CFLAGS = \

devhelp_la_LIBADD = \
$(DEVHELP_LIBS) \
$(COMMONLIBS) \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I now fixed this part in 2d1dee0 (and the markdown one in 856b3d9)

$(top_builddir)/devhelp/devhelp/libdevhelp-2.la

include $(top_srcdir)/build/cppcheck.mk
11 changes: 1 addition & 10 deletions geanyminiscript/src/gms_gui.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ideally should use <>s


Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not get that error if I build from current master.

#include <glib/gstdio.h>
#include <glib/gprintf.h>
Expand All @@ -43,15 +43,6 @@
#include <locale.h>
#endif

/* geany headers */
#include "support.h"
#include "plugindata.h"
#include "editor.h"
#include "document.h"
#include "prefs.h"
#include "utils.h"
#include "ui_utils.h"

/* user header */
#include "gms_debug.h"
#include "gms.h"
Expand Down
10 changes: 1 addition & 9 deletions shiftcolumn/src/shiftcolumn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,12 @@
# include "config.h"
#endif

#include "geany.h"
#include "support.h"
#include "geanyplugin.h"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<>s here too


#ifdef HAVE_LOCALE_H
# include <locale.h>
#endif

#include "ui_utils.h"

#include "document.h"
#include "keybindings.h"
#include "plugindata.h"
#include "geanyfunctions.h"

#include <glib.h>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change fixes

CC shiftcolumn.lo
shiftcolumn.c: In function 'shift_left_cb':
shiftcolumn.c:95:4: warning: implicit declaration of function 'sci_has_selection' [-Wimplicit-function-declaration]
if (sci_has_selection(sci)){
^
#include "sciwrappers.h" would also work but geanyplugin.h is recommended anyway

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to have been fixed separately in f2ab510.

#include <glib/gprintf.h>
#include <gdk/gdkkeysyms.h>
Expand Down