Fix cvs conflict.

[wxWidgets.git] / src / common / imaggif.cpp

diff --git a/src/common/imaggif.cpp b/src/common/imaggif.cpp
index e152a6cbda369817c9b710749e6abecc74602a00..b8a5229e2343eac696fbafb7e895d1ff03451b2b 100644 (file)
--- a/src/common/imaggif.cpp
+++ b/src/common/imaggif.cpp
@@ -22,7 +22,7 @@
 #  include "wx/defs.h"
 #endif
 
 #  include "wx/defs.h"
 #endif
 

-#if wxUSE_GIF
+#if wxUSE_IMAGE && wxUSE_GIF

 
 #include "wx/imaggif.h"
 #include "wx/gifdecod.h"
 
 #include "wx/imaggif.h"
 #include "wx/gifdecod.h"