From: Jonathan Wakely <jwakely@redhat.com>
Date: Wed, 21 May 2014 15:09:50 +0000 (+0100)
Subject: c_locale.cc (facet::_S_create_c_locale): Fix warning.
X-Git-Tag: releases/gcc-5.1.0~7390
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab65e21ab28c2e9a9955d3b7ede92cf2ffbb2a1c;p=thirdparty%2Fgcc.git

c_locale.cc (facet::_S_create_c_locale): Fix warning.

	* config/locale/dragonfly/c_locale.cc (facet::_S_create_c_locale):
	Fix warning.

From-SVN: r210716
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4dfc38095f16..6dd9b785d4d9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -7,6 +7,9 @@
 	* testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc:
 	Likewise.
 
+	* config/locale/dragonfly/c_locale.cc (facet::_S_create_c_locale):
+	Fix warning.
+
 2014-05-21  John Marino  <gnugcc@marino.st>
 
 	* acinclude.m4 (*-*-dragonfly*): New target.
diff --git a/libstdc++-v3/config/locale/dragonfly/c_locale.cc b/libstdc++-v3/config/locale/dragonfly/c_locale.cc
index 6c503db1809e..b698f821ad89 100644
--- a/libstdc++-v3/config/locale/dragonfly/c_locale.cc
+++ b/libstdc++-v3/config/locale/dragonfly/c_locale.cc
@@ -229,7 +229,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     char localspec[size__s + 6 + 1];
     
     if (__s == NULL) {
-       localspec[0] = NULL;
+       localspec[0] = '\0';
     } else {
        strcpy (localspec, __s);
        char * pch = strchr (localspec, '@');