[Pspp-commits] [SCM] GNU PSPP branch, master, updated. v0.6.1-2224-g3b74aa9

[Ben Pfaff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU PSPP".

The branch, master has been updated
       via  3b74aa9059aefe4ce82ecab1a5fd48cd251600dc (commit)
      from  14319bf7eda3adf7be9003fd51eae4b82874beee (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3b74aa9059aefe4ce82ecab1a5fd48cd251600dc
Author: Ben Pfaff <address@hidden>
Date:   Thu Aug 25 20:28:26 2011 -0700

    Fix build error if "close" macro is not always visible.
    
    Harry Thijssen <address@hidden> reported the following errors
    with recent Gnulib on Win32:
    
    src/language/lexer/lexer.c: In function 'lex_source_destroy':
    src/language/lexer/lexer.c:1455: error: 'const struct
        lex_reader_class' has no member named 'rpl_close'
    src/language/lexer/lexer.c:1456: error: 'const struct
        lex_reader_class' has no member named 'rpl_close'
    
    The problem was that the Gnulib substitute for <unistd.h>
    defines close to rpl_close, but this macro definition wasn't
    visible when lexer.c included lexer.h and became visible later.
    This commit fixes the problem by making sure that the macro
    definition is always visible in lexer.h.
    
    A better solution would probably be to rename the 'close'
    member to something other than a standard POSIX function name.
    
    The change to control-stack.h is just precautionary; Harry
    didn't report the same problem there.

-----------------------------------------------------------------------

Summary of changes:
 src/language/control/control-stack.h |    9 ++++++++-
 src/language/lexer/lexer.h           |    7 +++++++
 2 files changed, 15 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU PSPP