projects
/
debian
/
gzip
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'upstream/1.6'
[debian/gzip]
/
lib
/
mbsinit.c
diff --git
a/lib/mbsinit.c
b/lib/mbsinit.c
index 066ddfe5bf1dcfa789e17c71ef3c41b10106540c..26fbb7fa2f0a38e7152a8be0bb5b5dff83d6da9b 100644
(file)
--- a/
lib/mbsinit.c
+++ b/
lib/mbsinit.c
@@
-1,5
+1,5
@@
/* Test for initial conversion state.
/* Test for initial conversion state.
- Copyright (C) 2008
, 2009, 2010
Free Software Foundation, Inc.
+ Copyright (C) 2008
-2013
Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2008.
This program is free software: you can redistribute it and/or modify
Written by Bruno Haible <bruno@clisp.org>, 2008.
This program is free software: you can redistribute it and/or modify
@@
-22,6
+22,18
@@
#include "verify.h"
#include "verify.h"
+#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
+
+/* On native Windows, 'mbstate_t' is defined as 'int'. */
+
+int
+mbsinit (const mbstate_t *ps)
+{
+ return ps == NULL || *ps == 0;
+}
+
+#else
+
/* Platforms that lack mbsinit() also lack mbrlen(), mbrtowc(), mbsrtowcs()
and wcrtomb(), wcsrtombs().
We assume that
/* Platforms that lack mbsinit() also lack mbrlen(), mbrtowc(), mbsrtowcs()
and wcrtomb(), wcsrtombs().
We assume that
@@
-43,5
+55,7
@@
mbsinit (const mbstate_t *ps)
{
const char *pstate = (const char *)ps;
{
const char *pstate = (const char *)ps;
- return pstate[0] == 0;
+ return pstate
== NULL || pstate
[0] == 0;
}
}
+
+#endif