Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D426F200C2B for ; Thu, 2 Mar 2017 14:08:03 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id D2C2B160B6F; Thu, 2 Mar 2017 13:08:03 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 26CFA160B61 for ; Thu, 2 Mar 2017 14:08:03 +0100 (CET) Received: (qmail 46863 invoked by uid 500); 2 Mar 2017 13:08:01 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 46852 invoked by uid 99); 2 Mar 2017 13:08:01 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Mar 2017 13:08:01 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 78D833A0158 for ; Thu, 2 Mar 2017 13:08:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1785124 - /subversion/trunk/tools/client-side/svnconflict/svnconflict.c Date: Thu, 02 Mar 2017 13:08:00 -0000 To: commits@subversion.apache.org From: brane@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170302130800.78D833A0158@svn01-us-west.apache.org> archived-at: Thu, 02 Mar 2017 13:08:04 -0000 Author: brane Date: Thu Mar 2 13:07:59 2017 New Revision: 1785124 URL: http://svn.apache.org/viewvc?rev=1785124&view=rev Log: Remove warning -Wmissing-variable-declarations in svnconflict. * tools/client-side/svnconflict/svnconflict.c (svnconflict_options, svnconflict_global_options, svnconflict_cmd_table): Move global variables to static scope. Modified: subversion/trunk/tools/client-side/svnconflict/svnconflict.c Modified: subversion/trunk/tools/client-side/svnconflict/svnconflict.c URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svnconflict/svnconflict.c?rev=1785124&r1=1785123&r2=1785124&view=diff ============================================================================== --- subversion/trunk/tools/client-side/svnconflict/svnconflict.c (original) +++ subversion/trunk/tools/client-side/svnconflict/svnconflict.c Thu Mar 2 13:07:59 2017 @@ -86,7 +86,7 @@ typedef enum svnconflict_longopt_t { /* Option codes and descriptions. * The entire list must be terminated with an entry of nulls. */ -const apr_getopt_option_t svnconflict_options[] = +static const apr_getopt_option_t svnconflict_options[] = { {"help", 'h', 0, N_("show help on a subcommand")}, {NULL, '?', 0, N_("show help on a subcommand")}, @@ -140,10 +140,10 @@ static svn_error_t * svnconflict_resolve */ /* Options that apply to all commands. */ -const int svnconflict_global_options[] = +static const int svnconflict_global_options[] = { opt_auth_username, opt_auth_password, opt_config_dir, opt_config_options, 0 }; -const svn_opt_subcommand_desc2_t svnconflict_cmd_table[] = +static const svn_opt_subcommand_desc2_t svnconflict_cmd_table[] = { /* This command is also invoked if we see option "--help", "-h" or "-?". */ { "help", svnconflict_help, {"?", "h"}, N_