diff options
| author | Andrew Higginson <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
|---|---|---|
| committer | Andrew <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
| commit | 80960b623a99aae1402ab651b2974ef544ed3b03 (patch) | |
| tree | ba49d42c2789e9e11f805e2d5263e10f9fedeef8 /src/version.cpp | |
| parent | try to fix bug (diff) | |
| parent | GDL: Cherry-pick upstream patch 73852 (2011-03-23) - Add missing return value. (diff) | |
| download | inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.tar.gz inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.zip | |
merged with trunk so I can build again...
(bzr r10092.1.36)
Diffstat (limited to 'src/version.cpp')
| -rw-r--r-- | src/version.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/version.cpp b/src/version.cpp index edaa600db..438e47da9 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -1,10 +1,9 @@ -#define __VERSION_C__ - /* * Versions * * Authors: * MenTaLguY <mental@rydia.net> + * Jon A. Cruz <jon@joncruz.org> * * Copyright (C) 2003 MenTaLguY * @@ -12,7 +11,7 @@ */ #include <stdio.h> -#include <glib/gstrfuncs.h> +#include <glib.h> #include "version.h" gboolean sp_version_from_string(const gchar *string, Inkscape::Version *version) @@ -21,31 +20,31 @@ gboolean sp_version_from_string(const gchar *string, Inkscape::Version *version) return FALSE; } - version->major = 0; - version->minor = 0; + version->_major = 0; + version->_minor = 0; return sscanf((const char *)string, "%u.%u", - &version->major, &version->minor) || - sscanf((const char *)string, "%u", &version->major); + &version->_major, &version->_minor) || + sscanf((const char *)string, "%u", &version->_major); } gchar *sp_version_to_string(Inkscape::Version version) { - return g_strdup_printf("%u.%u", version.major, version.minor); + return g_strdup_printf("%u.%u", version._major, version._minor); } gboolean sp_version_inside_range(Inkscape::Version version, unsigned major_min, unsigned minor_min, unsigned major_max, unsigned minor_max) { - if ( version.major < major_min || version.major > major_max ) { + if ( version._major < major_min || version._major > major_max ) { return FALSE; - } else if ( version.major == major_min && - version.minor <= minor_min ) + } else if ( version._major == major_min && + version._minor <= minor_min ) { return FALSE; - } else if ( version.major == major_max && - version.minor >= minor_max ) + } else if ( version._major == major_max && + version._minor >= minor_max ) { return FALSE; } else { |