Convert ints used as bools to gbooleans

This matches the GOption documentation that G_OPTION_ARG_NONE should use
a gboolean.
This commit is contained in:
Dan Nicholson 2012-12-11 07:10:48 -08:00
parent 30e7f31318
commit 1b47b03c2a
4 changed files with 27 additions and 27 deletions

View file

@ -123,7 +123,7 @@ or auto])
esac
AC_MSG_RESULT($use_indirect_deps)
AC_DEFINE_UNQUOTED([ENABLE_INDIRECT_DEPS],
[`test $use_indirect_deps = no; echo $?`],
[`test $use_indirect_deps = yes && echo TRUE || echo FALSE`],
[Link library to all dependent libraries, not only directly needed ones])
AC_SUBST([use_indirect_deps])

44
main.c
View file

@ -38,33 +38,33 @@
char *pcsysrootdir = NULL;
char *pkg_config_pc_path = NULL;
static int want_my_version = 0;
static int want_version = 0;
static int want_libs = 0;
static int want_cflags = 0;
static int want_l_libs = 0;
static int want_L_libs = 0;
static int want_other_libs = 0;
static int want_I_cflags = 0;
static int want_other_cflags = 0;
static int want_list = 0;
static int want_static_lib_list = ENABLE_INDIRECT_DEPS;
static int want_short_errors = 0;
static int want_uninstalled = 0;
static gboolean want_my_version = FALSE;
static gboolean want_version = FALSE;
static gboolean want_libs = FALSE;
static gboolean want_cflags = FALSE;
static gboolean want_l_libs = FALSE;
static gboolean want_L_libs = FALSE;
static gboolean want_other_libs = FALSE;
static gboolean want_I_cflags = FALSE;
static gboolean want_other_cflags = FALSE;
static gboolean want_list = FALSE;
static gboolean want_static_lib_list = ENABLE_INDIRECT_DEPS;
static gboolean want_short_errors = FALSE;
static gboolean want_uninstalled = FALSE;
static char *variable_name = NULL;
static int want_exists = 0;
static int want_provides = 0;
static int want_requires = 0;
static int want_requires_private = 0;
static gboolean want_exists = FALSE;
static gboolean want_provides = FALSE;
static gboolean want_requires = FALSE;
static gboolean want_requires_private = FALSE;
static char *required_atleast_version = NULL;
static char *required_exact_version = NULL;
static char *required_max_version = NULL;
static char *required_pkgconfig_version = NULL;
static int want_silence_errors = 0;
static int want_variable_list = 0;
static int want_debug_spew = 0;
static int want_verbose_errors = 0;
static int want_stdout_errors = 0;
static gboolean want_silence_errors = FALSE;
static gboolean want_variable_list = FALSE;
static gboolean want_debug_spew = FALSE;
static gboolean want_verbose_errors = FALSE;
static gboolean want_stdout_errors = FALSE;
void
debug_spew (const char *format, ...)

View file

@ -35,9 +35,9 @@
#include <sys/types.h>
#ifdef G_OS_WIN32
int dont_define_prefix = FALSE;
gboolean dont_define_prefix = FALSE;
char *prefix_variable = "prefix";
int msvc_syntax = FALSE;
gboolean msvc_syntax = FALSE;
#endif
#ifdef G_OS_WIN32

4
pkg.h
View file

@ -131,12 +131,12 @@ extern char *pkg_config_pc_path;
#ifdef G_OS_WIN32
/* If TRUE, do not automatically define "prefix" while
* parsing each .pc file */
extern int dont_define_prefix;
extern gboolean dont_define_prefix;
/* The name of the variable that acts as prefix, unless it is "prefix" */
extern char *prefix_variable;
/* If TRUE, output flags in MSVC syntax. */
extern int msvc_syntax;
extern gboolean msvc_syntax;
#endif
#endif