Re: [PATCH] Move declarations of globals back to the files with "main",

[Karel Zak <kzak@xxxxxxxxxx>]

On Mon, Dec 17, 2007 at 07:59:12PM +0100, Jim Meyering wrote:
> 
> so we can compile with -fno-common.

 Thanks! I've added -fno-common to my CFLAGS.

>  mount/fstab.c    |    4 ++++
>  mount/lomount.c  |    4 ++++
>  mount/mount.c    |    4 ++++
>  mount/sundries.c |    4 ----
>  mount/swapon.c   |    1 +
>  mount/umount.c   |    4 ++++
>  6 files changed, 17 insertions(+), 4 deletions(-)

 Hmm... what about the tiny patch below? It fixes the problem, but all
 globals are declared on the one place (sundries.c) only.

    Karel

>From 5c4f157a2f337586c1847bfd01b99a14eee499d3 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@xxxxxxxxxx>
Date: Mon, 17 Dec 2007 22:28:48 +0100
Subject: [PATCH] swapon: add sundries.h

so we can compile with -fno-common.

Signed-off-by: Karel Zak <kzak@xxxxxxxxxx>
---
 mount/swapon.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/mount/swapon.c b/mount/swapon.c
index 34a183f..37af9ee 100644
--- a/mount/swapon.c
+++ b/mount/swapon.c
@@ -16,6 +16,7 @@
 #include "fsprobe.h"
 #include "realpath.h"
 #include "pathnames.h"
+#include "sundries.h"
 
 #ifdef HAVE_SYS_SWAP_H
 # include <sys/swap.h>
@@ -35,8 +36,6 @@
 
 int all = 0;
 int priority = -1;	/* non-prioritized swap by default */
-int verbose;
-char *progname;
 
 /* If true, don't complain if the device/file doesn't exist */
 int ifexists = 0;
-- 
1.5.3.1


-
To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html