Parcourir la source

Fix compilation with clang

Martin Duquesnoy il y a 12 ans
Parent
commit
3fcc2b844b
5 fichiers modifiés avec 11 ajouts et 7 suppressions
  1. 2 2
      src/client.c
  2. 2 2
      src/client.h
  3. 1 1
      src/layout.c
  4. 1 1
      src/layout.h
  5. 5 1
      src/status.c

+ 2 - 2
src/client.c

@@ -88,7 +88,7 @@ CLIENT_ACTION_LIST(focus, prev_tab)
 /** Send a ConfigureRequest event to the struct client
  * \param c struct client pointer
 */
-inline void
+void
 client_configure(struct client *c)
 {
      XConfigureEvent ev =
@@ -1352,7 +1352,7 @@ client_fac_resize(struct client *c, enum position p, int fac)
      XUngrabKeyboard(W->dpy, CurrentTime);
 }
 
-inline void
+void
 client_fac_hint(struct client *c)
 {
      int w = c->sizeh[MINW] + c->border + c->border;

+ 2 - 2
src/client.h

@@ -18,7 +18,7 @@
      SLIST_FOREACH(V, H, F)       \
      if(!(V->flags & CLIENT_FREE))
 
-inline void client_configure(struct client *c);
+void client_configure(struct client *c);
 struct client *client_gb_win(Window w);
 struct client *client_gb_frame(Window w);
 struct client *client_gb_pos(struct tag *t, int x, int y);
@@ -55,7 +55,7 @@ void client_apply_tgeo(struct tag *t);
 #define CPROP_TAB  0x08
 void client_update_props(struct client *c, Flags f);
 
-inline void client_fac_hint(struct client *c);
+void client_fac_hint(struct client *c);
 void uicb_client_untab(Uicb cmd);
 void uicb_client_toggle_free(Uicb cmd);
 

+ 1 - 1
src/layout.c

@@ -422,7 +422,7 @@ layout_split_integrate(struct client *c, struct client *sc)
  * |_____|----'| -> |_____|__v__|
  *          ^^^ void
  */
-inline void
+void
 layout_fix_hole(struct client *c)
 {
      struct client *cr = client_next_with_pos(c, Right);

+ 1 - 1
src/layout.h

@@ -33,7 +33,7 @@ void layout_save_set(struct tag *t);
 void layout_free_set(struct tag *t);
 void layout_split_integrate(struct client *c, struct client *sc);
 void layout_split_arrange_closed(struct client *ghost);
-inline void layout_fix_hole(struct client *c);
+void layout_fix_hole(struct client *c);
 void layout_client(struct client *c);
 void uicb_layout_vmirror(Uicb cmd);
 void uicb_layout_hmirror(Uicb cmd);

+ 5 - 1
src/status.c

@@ -171,7 +171,11 @@ status_parse(struct status_ctx *ctx)
            * Parse it while there is a mousebind sequence.
            */
           dstr = end + 1;
-          while((*(dstr = status_parse_mouse(sq, dstr)) == '('));
+
+          do
+               dstr = status_parse_mouse(sq, dstr);
+          while(*dstr == '(');
+
           --dstr;
 
           prev = sq;