diff options
-rw-r--r-- | calmwm.h | 8 | ||||
-rw-r--r-- | group.c | 7 | ||||
-rw-r--r-- | parse.y | 4 |
3 files changed, 9 insertions, 10 deletions
@@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: calmwm.h,v 1.71 2009/01/11 21:34:22 okan Exp $ + * $Id: calmwm.h,v 1.72 2009/01/11 21:46:48 oga Exp $ */ #ifndef _CALMWM_H_ @@ -140,11 +140,7 @@ struct client_ctx { TAILQ_HEAD(client_ctx_q, client_ctx); -static char *shortcut_to_name[] = { - "nogroup", "one", "two", "three", - "four", "five", "six", "seven", - "eight", "nine" -}; +extern const char *shortcut_to_name[]; struct group_ctx { TAILQ_ENTRY(group_ctx) entry; @@ -16,7 +16,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: group.c,v 1.19 2008/07/18 15:40:52 oga Exp $ + * $Id: group.c,v 1.20 2009/01/11 21:46:48 oga Exp $ */ #include "headers.h" @@ -29,6 +29,11 @@ struct group_ctx Groups[CALMWM_NGROUPS]; int Grouphideall = 0; struct group_ctx_q Groupq; +const char *shortcut_to_name[] = { + "nogroup", "one", "two", "three", "four", "five", "six", + "seven", "eight", "nine" +}; + static void _group_add(struct group_ctx *gc, struct client_ctx *cc) { @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.14 2009/01/11 21:33:45 okan Exp $ */ +/* $OpenBSD: parse.y,v 1.15 2009/01/11 21:46:48 oga Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -54,8 +54,6 @@ int findeol(void); static struct conf *conf; -extern char *shortcut_to_name[]; - typedef struct { union { int64_t number; |