diff options
| author | Bob Jamison <ishmalius@gmail.com> | 2007-03-29 17:10:50 +0000 |
|---|---|---|
| committer | ishmal <ishmal@users.sourceforge.net> | 2007-03-29 17:10:50 +0000 |
| commit | 9e530cad6770f9c2acda5353a00eeddd99a6b7bd (patch) | |
| tree | 147bcc3f43e1e525b08a23fb1dc7678240c227d2 /src/dom/util | |
| parent | fix bug [ 1685070 ] PathAlongPath - Error message when no paths selected (diff) | |
| download | inkscape-9e530cad6770f9c2acda5353a00eeddd99a6b7bd.tar.gz inkscape-9e530cad6770f9c2acda5353a00eeddd99a6b7bd.zip | |
make glib dep configurable again
(bzr r2776)
Diffstat (limited to 'src/dom/util')
| -rw-r--r-- | src/dom/util/ziptool.cpp | 27 | ||||
| -rw-r--r-- | src/dom/util/ziptool.h | 28 |
2 files changed, 44 insertions, 11 deletions
diff --git a/src/dom/util/ziptool.cpp b/src/dom/util/ziptool.cpp index 7dbd07be5..fc4c7bad4 100644 --- a/src/dom/util/ziptool.cpp +++ b/src/dom/util/ziptool.cpp @@ -13,7 +13,7 @@ * Authors: * Bob Jamison * - * Copyright (C) 2006 Bob Jamison + * Copyright (C) 2006-2007 Bob Jamison * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -231,12 +231,20 @@ private: /** * */ - void error(char *fmt, ...); + void error(char *fmt, ...) + #ifdef G_GNUC_PRINTF + G_GNUC_PRINTF(2, 3) + #endif + ; /** * */ - void trace(char *fmt, ...); + void trace(char *fmt, ...) + #ifdef G_GNUC_PRINTF + G_GNUC_PRINTF(2, 3) + #endif + ; /** * @@ -836,8 +844,17 @@ public: private: //debug messages - void error(char *fmt, ...); - void trace(char *fmt, ...); + void error(char *fmt, ...) + #ifdef G_GNUC_PRINTF + G_GNUC_PRINTF(2, 3) + #endif + ; + + void trace(char *fmt, ...) + #ifdef G_GNUC_PRINTF + G_GNUC_PRINTF(2, 3) + #endif + ; bool compressWindow(); diff --git a/src/dom/util/ziptool.h b/src/dom/util/ziptool.h index 120fe568a..f8cf01cc8 100644 --- a/src/dom/util/ziptool.h +++ b/src/dom/util/ziptool.h @@ -15,7 +15,7 @@ * Authors: * Bob Jamison * - * Copyright (C) 2006 Bob Jamison + * Copyright (C) 2006-2007 Bob Jamison * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,7 +32,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <glib.h> #include <vector> #include <string> @@ -204,8 +203,17 @@ private: std::string fileName; //debug messages - void error(char *fmt, ...) G_GNUC_PRINTF(2,3); - void trace(char *fmt, ...) G_GNUC_PRINTF(2,3); + void error(char *fmt, ...) + #ifdef G_GNUC_PRINTF + G_GNUC_PRINTF(2, 3) + #endif + ; + + void trace(char *fmt, ...) + #ifdef G_GNUC_PRINTF + G_GNUC_PRINTF(2, 3) + #endif + ; unsigned long crc; @@ -470,8 +478,16 @@ public: private: //debug messages - void error(char *fmt, ...) G_GNUC_PRINTF(2,3); - void trace(char *fmt, ...) G_GNUC_PRINTF(2,3); + void error(char *fmt, ...) + #ifdef G_GNUC_PRINTF + G_GNUC_PRINTF(2, 3) + #endif + ; + void trace(char *fmt, ...) + #ifdef G_GNUC_PRINTF + G_GNUC_PRINTF(2, 3) + #endif + ; //# Private writing methods |