fix clang complier warnings

Author: jcupitt

meson.build

@@ -4,7 +4,7 @@ project( 'nip4', 'c',
   license: 'GPL',
   meson_version: '>=0.64',
   default_options: [
-    'c_std=c11',
+    'c_std=c2x',
     # turn off asserts etc. in release mode
     'b_ndebug=if-release'
   ]

src/dump.c

@@ -624,16 +624,16 @@ print_element(int nsp, EType type, void *arg)
 		break;
 
 	case ELEMENT_BINOP:
-		printf("binop \"%s\"", decode_BinOp((BinOp) arg));
+		printf("binop \"%s\"", decode_BinOp((BinOp) GPOINTER_TO_INT(arg)));
 		break;
 
 	case ELEMENT_UNOP:
-		printf("unop \"%s\"", decode_UnOp((UnOp) arg));
+		printf("unop \"%s\"", decode_UnOp((UnOp) GPOINTER_TO_INT(arg)));
 		break;
 
 	case ELEMENT_COMB:
 		printf("combinator \"%s\"",
-			decode_CombinatorType((CombinatorType) arg));
+			decode_CombinatorType((CombinatorType) GPOINTER_TO_INT(arg)));
 		break;
 
 	case ELEMENT_TAG:

src/heap.h

@@ -302,9 +302,9 @@ typedef struct pelement {
 #define PEGETSYMBOL(P) ((Symbol *) PEGETVAL(P))
 #define PEGETSYMREF(P) ((Symbol *) PEGETVAL(P))
 #define PEGETCOMPILE(P) ((Compile *) (PEGETVAL(P)))
-#define PEGETBINOP(P) ((BinOp) PEGETVAL(P))
-#define PEGETUNOP(P) ((UnOp) PEGETVAL(P))
-#define PEGETCOMB(P) ((CombinatorType) PEGETVAL(P))
+#define PEGETBINOP(P) ((BinOp) GPOINTER_TO_INT(PEGETVAL(P)))
+#define PEGETUNOP(P) ((UnOp) GPOINTER_TO_INT(PEGETVAL(P)))
+#define PEGETCOMB(P) ((CombinatorType) GPOINTER_TO_INT(PEGETVAL(P)))
 #define PEGETTAG(P) ((char *) PEGETVAL(P))
 #define PEGETREAL(P) (PEGETVAL(P)->body.num)
 #define PEGETBOOL(P) ((gboolean) GPOINTER_TO_UINT(PEGETVAL(P)))

src/infobar.c

@@ -233,7 +233,6 @@ infobar_update_pixel(Infobar *infobar,
 	Tilesource *tilesource, double image_x, double image_y)
 {
 	if (!infobar->updating) {
-		Imagewindow *win = infobar->win;
 		PixelUpdate *update = g_new0(PixelUpdate, 1);
 
 		update->infobar = infobar;

src/kplot/extern.h

@@ -122,8 +122,6 @@ struct	kplotctx {
 	struct kpair	 dims;
 };
 
-__BEGIN_DECLS
-
 int	 kdata_dep_add(struct kdata *, struct kdata *, ksetfunc);
 int	 kdata_dep_run(struct kdata *, size_t);
 int	 kdata_set(struct kdata *, size_t, double, double);
@@ -153,6 +151,4 @@ int kplot_cairo_to_data(struct kplotctx *ctx,
 	double cairo_x, double cairo_y,
 	double *data_x, double *data_y);
 
-__END_DECLS
-
 #endif

src/kplot/kplot.h

@@ -187,8 +187,6 @@ struct	kplotcfg {
 struct 	kdata;
 struct	kplot;
 
-__BEGIN_DECLS
-
 void		 kdata_destroy(struct kdata *);
 int		 kdata_get(const struct kdata *, size_t, struct kpair *);
 
@@ -258,6 +256,4 @@ struct kplotcfg	*kplot_get_plotcfg(struct kplot *);
 
 #include "extern.h"
 
-__END_DECLS
-
 #endif

src/workspaceview.c

@@ -1082,7 +1082,7 @@ workspaceview_drag_update(GtkEventControllerMotion *self,
 		break;
 
 	case WVIEW_SELECT:
-		if (abs(offset_x) > 5 || abs(offset_x) > 5) {
+		if (fabs(offset_x) > 5 || fabs(offset_x) > 5) {
 			wview->state = WVIEW_DRAG;
 
 			if (wview->drag_cview)