Merge branch 'em-fixes'

externals/ggee/gui/w_envgen.h

@@ -529,9 +529,10 @@ void envgen_key(t_envgen *x, t_floatarg f)
     }
 }
 
-static int envgen_newclick(t_envgen *x, struct _glist *glist,
+static int envgen_newclick(t_gobj *z, struct _glist *glist,
     int xpos, int ypos, int shift, int alt, int dbl, int doit)
 {
+    t_envgen *x = (t_envgen *)z;
     /* check if user wants to resize */
     float wxpos = text_xpix(&x->x_obj, glist);
     float wypos = (int) (text_ypix(&x->x_obj,glist) + x->w.height);

externals/loaders/libdir/libdir.c

@@ -59,7 +59,7 @@ static int libdir_add_to_path(const char*dirbuf, t_canvas*canvas) {
   return 0;
 }
 
-static int libdir_loader_legacy(t_canvas *canvas, char *classname)
+static int libdir_loader_legacy(t_canvas *canvas, const char *classname, const char *path)
 {
     int fd = -1;
     char fullclassname[FILENAME_MAX], dirbuf[FILENAME_MAX];