From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31166 invoked by alias); 14 Jan 2013 14:43:12 -0000 Received: (qmail 31083 invoked by uid 22791); 14 Jan 2013 14:43:10 -0000 X-SWARE-Spam-Status: No, hits=-5.5 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W X-Spam-Check-By: sourceware.org Received: from eggs.gnu.org (HELO eggs.gnu.org) (208.118.235.92) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 14 Jan 2013 14:43:00 +0000 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TufcL-0001z9-CU for gcc-patches@gcc.gnu.org; Mon, 14 Jan 2013 03:42:08 -0500 Received: from cantor2.suse.de ([195.135.220.15]:43220 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TufcL-0001yw-6C for gcc-patches@gcc.gnu.org; Mon, 14 Jan 2013 03:42:05 -0500 Received: from relay2.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 1CAC5A3A4A for ; Mon, 14 Jan 2013 09:42:04 +0100 (CET) Date: Mon, 14 Jan 2013 14:43:00 -0000 From: Richard Biener To: gcc-patches@gcc.gnu.org Subject: [PATCH] Fix fixinclude common/non-common mix Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2013-01/txt/msg00685.txt.bz2 fixincludes mixes common declarations (in fixlib.h) and non-common decls (where they are defined) for verbose_level and fixinc_mode. XCode on Mountain Lion doesn't like this and its linker (rightfully) complains. Fixed with the following, committed as obvious. Richard. 2013-01-14 Richard Biener * fixlib.h (verbose_level, fixinc_mode): Mark extern. Index: fixincludes/fixlib.h =================================================================== --- fixincludes/fixlib.h (revision 195140) +++ fixincludes/fixlib.h (working copy) @@ -223,7 +223,7 @@ typedef enum { VERB_EVERYTHING } te_verbose; -te_verbose verbose_level; +extern te_verbose verbose_level; #define VLEVEL(l) ((unsigned int) verbose_level >= (unsigned int) l) #define NOT_SILENT VLEVEL(VERB_FIXES) @@ -233,7 +233,7 @@ typedef enum { TESTING_ON = 1 } fixinc_mode_t; -fixinc_mode_t fixinc_mode; +extern fixinc_mode_t fixinc_mode; #ifdef HAVE_MMAP_FILE #define UNLOAD_DATA() do { if (curr_data_mapped) { \