mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-16 18:25:11 -06:00
Merge Richard Cohen's 'cleanup-build' into stable.
This commit is contained in:
John Ralls
commit
26162da450
@ -692,14 +692,6 @@ install(FILES ${gnucash_DOCS} DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
||||
|
||||
# Create config.h
|
||||
|
||||
if (WIN32)
|
||||
if (MINGW)
|
||||
set (HAVE_SCANF_LLD 1)
|
||||
else ()
|
||||
set (HAVE_SCANF_I64D 1)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
check_include_files (dirent.h HAVE_DIRENT_H)
|
||||
check_include_files (dlfcn.h HAVE_DLFCN_H)
|
||||
check_include_files (glob.h HAVE_GLOB_H)
|
||||
@ -764,7 +756,6 @@ set (HAVE_LINK 1)
|
||||
set (HAVE_LOCALTIME_R 1)
|
||||
set (HAVE_PTHREAD_MUTEX_INIT 1)
|
||||
set (HAVE_PTHREAD_PRIO_INHERIT 1)
|
||||
set (HAVE_SCANF_LLD 1)
|
||||
set (HAVE_SETENV 1)
|
||||
set (HAVE_STPCPY 1)
|
||||
set (HAVE_STRPTIME 1)
|
||||
|
||||
@ -153,15 +153,6 @@
|
||||
/* If available, contains the Python version number currently in use. */
|
||||
#cmakedefine HAVE_PYTHON 1
|
||||
|
||||
/* Define if scanf supports %I64d conversions. */
|
||||
#cmakedefine HAVE_SCANF_I64D 1
|
||||
|
||||
/* Define if scanf supports %lld conversions. */
|
||||
#cmakedefine HAVE_SCANF_LLD 1
|
||||
|
||||
/* Define if scanf supports %qd conversions. */
|
||||
#cmakedefine HAVE_SCANF_QD 1
|
||||
|
||||
/* Define to 1 if you have the `setenv' function. */
|
||||
#cmakedefine HAVE_SETENV 1
|
||||
|
||||
@ -334,8 +325,3 @@
|
||||
#cmakedefine WEBKIT2 1
|
||||
#cmakedefine WEBKIT1 1
|
||||
|
||||
/* Definitions for all OS */
|
||||
/* From cutecash */
|
||||
//#define HAVE_LIBQOF /**/
|
||||
//#define QOF_DISABLE_DEPRECATED 1
|
||||
//#define GNC_NO_LOADABLE_MODULES 1
|
||||
|
||||
@ -29,14 +29,6 @@
|
||||
#undef G_LOG_DOMAIN
|
||||
#define G_LOG_DOMAIN "gnc.printing"
|
||||
|
||||
/* Do not treat -Wstrict-aliasing warnings as errors because of problems of the
|
||||
* G_LOCK* macros as declared by glib. See
|
||||
* https://bugs.gnucash.org/show_bug.cgi?id=316221 for additional information.
|
||||
*/
|
||||
#if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 2)
|
||||
# pragma GCC diagnostic warning "-Wstrict-aliasing"
|
||||
#endif
|
||||
|
||||
static GtkPrintSettings *print_settings = NULL;
|
||||
static GtkPageSetup *page_setup = NULL;
|
||||
G_LOCK_DEFINE_STATIC(print_settings);
|
||||
|
||||
@ -20,7 +20,7 @@ set(test_aqb_INCLUDE_DIRS
|
||||
set(test_aqb_LIBS
|
||||
gncmod-aqbanking gnc-generic-import gnc-gnome gnc-gnome-utils
|
||||
gnc-ledger-core gnc-app-utils
|
||||
gncmod-backend-xml-utils gnc-engine gnc-core-utils gnc-module
|
||||
gnc-backend-xml-utils gnc-engine gnc-core-utils gnc-module
|
||||
)
|
||||
|
||||
set_dist_list(test_aqb_DIST ${test_aqb_SOURCES} file-book.gnucash
|
||||
|
||||
@ -1935,7 +1935,7 @@ xaccParseAmountInternal (const char * in_str, gboolean monetary,
|
||||
{
|
||||
*out = '\0';
|
||||
|
||||
if (*out_str && sscanf(out_str, QOF_SCANF_LLD, &numer) < 1)
|
||||
if (*out_str && sscanf(out_str, "%lld", &numer) < 1)
|
||||
next_state = NO_NUM_ST;
|
||||
else if (next_state == FRAC_ST)
|
||||
{
|
||||
@ -1977,7 +1977,7 @@ xaccParseAmountInternal (const char * in_str, gboolean monetary,
|
||||
}
|
||||
|
||||
long long int fraction;
|
||||
if (sscanf (out_str, QOF_SCANF_LLD, &fraction) < 1)
|
||||
if (sscanf (out_str, "%lld", &fraction) < 1)
|
||||
{
|
||||
g_free(out_str);
|
||||
return FALSE;
|
||||
|
||||
@ -455,8 +455,6 @@ GncSqlBackend::write_schedXactions()
|
||||
return is_ok;
|
||||
}
|
||||
|
||||
#pragma GCC diagnostic warning "-Wformat-nonliteral"
|
||||
|
||||
void
|
||||
GncSqlBackend::sync(QofBook* book)
|
||||
{
|
||||
|
||||
@ -125,9 +125,3 @@ install(TARGETS gncmod-backend-xml
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||
|
||||
# ----
|
||||
|
||||
# Special normal (non-MODULE) library for cutecash only
|
||||
add_library(gncmod-backend-xml-utils ${libgncmod_backend_xml_SOURCES})
|
||||
target_link_libraries(gncmod-backend-xml-utils gnc-backend-xml-utils gnc-engine
|
||||
gnc-core-utils ${LIBXML2_LDFLAGS} PkgConfig::GLIB2 ${ZLIB_LIBRARY})
|
||||
target_compile_definitions (gncmod-backend-xml-utils PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.xml\" -DU_SHOW_CPLUSPLUS_API=0)
|
||||
|
||||
@ -73,14 +73,6 @@
|
||||
#include "io-gncxml-v2.h"
|
||||
#include "io-gncxml-gen.h"
|
||||
|
||||
/* Do not treat -Wstrict-aliasing warnings as errors because of problems of the
|
||||
* G_LOCK* macros as declared by glib. See
|
||||
* https://bugs.gnucash.org/show_bug.cgi?id=316221 for additional information.
|
||||
*/
|
||||
#if (__GNUC__ >= 4 && __GNUC_MINOR__ >= 2)
|
||||
# pragma GCC diagnostic warning "-Wstrict-aliasing"
|
||||
#endif
|
||||
|
||||
static QofLogModule log_module = GNC_MOD_IO;
|
||||
|
||||
typedef struct
|
||||
|
||||
@ -171,7 +171,7 @@ string_to_gint64 (const gchar* str, gint64* v)
|
||||
g_return_val_if_fail (str, FALSE);
|
||||
|
||||
/* must use "<" here because %n's effects aren't well defined */
|
||||
if (sscanf (str, " " QOF_SCANF_LLD "%n", &v_in, &num_read) < 1)
|
||||
if (sscanf (str, " %lld%n", &v_in, &num_read) < 1)
|
||||
{
|
||||
return (FALSE);
|
||||
}
|
||||
|
||||
@ -45,21 +45,6 @@ extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
/** Do not use these for printf, only scanf */
|
||||
#if HAVE_SCANF_LLD
|
||||
# define QOF_SCANF_LLD "%lld"
|
||||
#else
|
||||
# if HAVE_SCANF_QD
|
||||
# define QOF_SCANF_LLD "%qd"
|
||||
# else
|
||||
# if HAVE_SCANF_I64D
|
||||
# define QOF_SCANF_LLD "%I64d"
|
||||
# else
|
||||
# error "No scanf format string is known for LLD. Fix your ./configure so that the correct one is detected!"
|
||||
# endif
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#define QOF_MOD_UTIL "qof.utilities"
|
||||
|
||||
/** \name typedef enum as string macros
|
||||
|
||||
Loading…
Reference in New Issue
Block a user