subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daniel Shahaf <...@daniel.shahaf.name>
Subject Re: [PATCH] Remove NLS check from kwallet.m4 (was Re: Does KWallet support really need NLS on?)
Date Mon, 03 Sep 2012 18:44:45 GMT
Raphael Kubo da Costa wrote on Mon, Sep 03, 2012 at 08:15:11 -0300:
> Daniel Shahaf <d.s@daniel.shahaf.name> writes:
> 
> > Arfrever Frehtes Taifersar Arahesis wrote on Sun, Sep 02, 2012 at 22:11:11 +0200:
> >> We need to decide if we support GCC <4.3.0 on GNU systems.
> >
> > Can't kwallet.m4 only require --enable-nls if the compiler is gcc <4.3 ?
> 
> Or if building some version of Arfrever's test code fails? Speaking of
> that, isn't the problem of disabling NLS, including
> svn_private_config.h and risking including something else which may use
> libintl.h independent of the kwallet code?

I think the correct fix is to include headers in the correct order ---
in this case, to move the kwallet includes (which are "external library",
ie, neither svn's code nor OS/libc) up within kwallet.cpp.

The current order is:

kwallet.cpp:#include <stdlib.h>
kwallet.cpp:#include <string.h>
kwallet.cpp:#include <unistd.h>
kwallet.cpp:#include <apr_pools.h>
kwallet.cpp:#include <apr_strings.h>
kwallet.cpp:#include "svn_auth.h"
kwallet.cpp:#include "svn_config.h"
kwallet.cpp:#include "svn_error.h"
kwallet.cpp:#include "svn_io.h"
kwallet.cpp:#include "svn_pools.h"
kwallet.cpp:#include "svn_string.h"
kwallet.cpp:#include "svn_version.h"
kwallet.cpp:#include "private/svn_auth_private.h"
kwallet.cpp:#include "svn_private_config.h"
kwallet.cpp:#include <dbus/dbus.h>
kwallet.cpp:#include <QtCore/QCoreApplication>
kwallet.cpp:#include <QtCore/QString>
kwallet.cpp:#include <kaboutdata.h>
kwallet.cpp:#include <kcmdlineargs.h>
kwallet.cpp:#include <kcomponentdata.h>
kwallet.cpp:#include <klocalizedstring.h>
kwallet.cpp:#include <kwallet.h>

Mime
View raw message