diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2012-12-16 05:41:25 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2012-12-16 05:41:25 +0000 |
| commit | 7ec903c9898f872dbd9426ed7a62e1969fdb7be7 (patch) | |
| tree | a306139e829118a83516af02279c9eafd3440eaa /src/dom | |
| parent | Hershey Text: whitespace; py: docstring, modeline; inx: fix attribute value (diff) | |
| parent | Translations.Spanish translation update by Lucas Vieites. (diff) | |
| download | inkscape-7ec903c9898f872dbd9426ed7a62e1969fdb7be7.tar.gz inkscape-7ec903c9898f872dbd9426ed7a62e1969fdb7be7.zip | |
merge from trunk (r11955)
(bzr r11687.1.3)
Diffstat (limited to 'src/dom')
| -rw-r--r-- | src/dom/prop-css.cpp | 2 | ||||
| -rw-r--r-- | src/dom/prop-css2.cpp | 2 | ||||
| -rw-r--r-- | src/dom/svgimpl.cpp | 2 | ||||
| -rw-r--r-- | src/dom/util/ziptool.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/dom/prop-css.cpp b/src/dom/prop-css.cpp index a0d66d939..9922b4935 100644 --- a/src/dom/prop-css.cpp +++ b/src/dom/prop-css.cpp @@ -1137,7 +1137,7 @@ NULL -bool printTable() +static bool printTable() { for (CssProp *prop=cssProps; prop->name ; prop++) { diff --git a/src/dom/prop-css2.cpp b/src/dom/prop-css2.cpp index 33548fbb9..9fe998552 100644 --- a/src/dom/prop-css2.cpp +++ b/src/dom/prop-css2.cpp @@ -1279,7 +1279,7 @@ bool parseProperty(char *name, char *value) } -bool printTable() +static bool printTable() { for (CssProp *prop=cssProps; prop->name ; prop++) { diff --git a/src/dom/svgimpl.cpp b/src/dom/svgimpl.cpp index cf28dfec5..87f43af81 100644 --- a/src/dom/svgimpl.cpp +++ b/src/dom/svgimpl.cpp @@ -119,7 +119,7 @@ SVGTableEntry interfaceTable[] = { "SVGUnitTypes", SVG_UNIT_TYPES }, { "SVGURIReference", SVG_URI_REFERENCE }, { "SVGViewSpec", SVG_VIEW_SPEC }, - { "SVGZoomAndPan", SVG_ZOOM_AND_PAN } + { "SVGZoomAndPan", static_cast<int>(SVG_ZOOM_AND_PAN)} }; diff --git a/src/dom/util/ziptool.cpp b/src/dom/util/ziptool.cpp index 081bcbbc4..9d9d5685c 100644 --- a/src/dom/util/ziptool.cpp +++ b/src/dom/util/ziptool.cpp @@ -126,7 +126,7 @@ static unsigned long crc_table[256]; /** * make the table for a fast CRC. */ -void makeCrcTable() +static void makeCrcTable() { if (crc_table_ready) return; |