summaryrefslogtreecommitdiff
path: root/camlibs/canon
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2014-02-22 16:40:35 +0000
committerMarcus Meissner <marcus@jet.franken.de>2014-02-22 16:40:35 +0000
commit09b41662b8ed0f296621aa5895b4e4a981a53060 (patch)
treee6f439cf98c885525c8ba389c9b4b8d00e6fe8fd /camlibs/canon
parent25de32d2ea5065a6cb1e5b6409dabf745f838014 (diff)
downloadlibgphoto2-09b41662b8ed0f296621aa5895b4e4a981a53060.tar.gz
undef NOERROR, is defined in winerror.h
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14768 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/canon')
-rw-r--r--camlibs/canon/serial.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/camlibs/canon/serial.h b/camlibs/canon/serial.h
index d8b09b78e..50b993304 100644
--- a/camlibs/canon/serial.h
+++ b/camlibs/canon/serial.h
@@ -88,6 +88,7 @@ int canon_serial_get_thumbnail (Camera *camera, const char *name, unsigned char
* Used within serial code to signal various error conditions.
*
*/
+#undef NOERROR /* happens in windows. is also 0 */
typedef enum {
NOERROR = 0,
ERROR_RECEIVED = 1,