aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libstdc++-v3/ChangeLog3
-rw-r--r--libstdc++-v3/config/locale/dragonfly/c_locale.cc2
2 files changed, 4 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4dfc380..6dd9b78 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 6c503db..b698f82 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, '@');