From e0f19401ad246500ee5313140c12d51a16e05668 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 1 Mar 2010 19:54:41 +0000 Subject: Add a mapping for ESPIPE on W32CE. --- ChangeLog | 4 ++++ autogen.sh | 6 ++++-- src/mkw32errmap.c | 5 +++-- src/w32-gettext.c | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3dc9c22..03c0ca2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-03-01 Werner Koch + + * src/mkw32errmap.c: Map ESPIPE. + 2010-02-17 Werner Koch * src/Makefile.am: Revert last change. diff --git a/autogen.sh b/autogen.sh index 0de2d08..32c83df 100755 --- a/autogen.sh +++ b/autogen.sh @@ -103,7 +103,7 @@ if [ "$myhost" = "w32" ]; then fi ./configure --enable-maintainer-mode --prefix=${w32root} \ - --host=${host} --build=${build} + --host=${host} --build=${build} "$@" exit $? fi @@ -222,4 +222,6 @@ $AUTOMAKE --gnu; echo "Running autoconf${FORCE} ..." $AUTOCONF${FORCE} -echo "You may now run \"./configure --enable-maintainer-mode && make\"." +echo "You may now run + ./configure --enable-maintainer-mode && make +" diff --git a/src/mkw32errmap.c b/src/mkw32errmap.c index 8b56dec..722e07e 100644 --- a/src/mkw32errmap.c +++ b/src/mkw32errmap.c @@ -79,7 +79,6 @@ struct table_s table[] = #ifdef RESOLVE_MACROS #define X(a,b) \ {&mkw32errmap_marker, (a), (b)} - X( "EPERM", ERROR_CANNOT_MAKE ), X( "ENOENT", ERROR_FILE_NOT_FOUND ), X( "EINTR", ERROR_INVALID_AT_INTERRUPT_TIME ), @@ -98,6 +97,8 @@ struct table_s table[] = X( "EXDEV", ERROR_NOT_SAME_DEVICE ), X( "ENODEV", ERROR_BAD_DEVICE ), + /* FIXME: ERROR_DEV_NOT_EXIST */ + X( "ENOTDIR",ERROR_DIRECTORY ), X( "EINVAL", ERROR_INVALID_PARAMETER ), X( "ENFILE", ERROR_NO_MORE_FILES ), @@ -111,11 +112,11 @@ struct table_s table[] = X( "ENOLCK", ERROR_SHARING_BUFFER_EXCEEDED ), X( "ENOSYS", ERROR_NOT_SUPPORTED ), X( "ENOTEMPTY",ERROR_DIR_NOT_EMPTY ), + X( "ESPIPE", ERROR_SEEK_ON_DEVICE ), #if 0 /* FIXME: Find appropriate mappings. */ X( "EILSEQ", ), X( "EDOM", ), X( "EMLINK", ), - X( "ESPIPE", ), /* Invalid seek (seek on a pipe?) */ X( "ESRCH", ), /* No such process */ X( "E2BIG", ), /* Arg list too long */ X( "ENOEXEC", ), /* Exec format error */ diff --git a/src/w32-gettext.c b/src/w32-gettext.c index a35af1f..da07a25 100644 --- a/src/w32-gettext.c +++ b/src/w32-gettext.c @@ -1837,7 +1837,7 @@ _gpg_w32_gettext_localename (void) /* With a VALUE of 1 switch the gettext functions into utf8 mode. That is the strings are returned without translation to the native - charset. A VALUE of 0 swicthes back to trnslated strings. A VALUE + charset. A VALUE of 0 switches back to translated strings. A VALUE of -1 returns the current value. */ int _gpg_w32_gettext_use_utf8 (int value) -- cgit v1.2.3