[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvt.h

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.478 by root, Thu May 17 22:00:57 2012 UTC vs.
Revision 1.480 by sf-exg, Sat May 19 13:07:25 2012 UTC

 #if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY)
 # define HAVE_BG_PIXMAP 1
 #endif
+#include <ecb.h>
 #include "encoding.h"
 #include "rxvtutil.h"
 #include "rxvtfont.h"
 #include "rxvttoolkit.h"
 #include "scrollbar.h"
   int h_align, v_align;          /* percents of the window size:
                                     0 - left align, 50 - center, 100 - right */
 #  ifdef HAVE_PIXBUF
   GdkPixbuf *pixbuf;
-#  endif
   ~rxvt_image ()
   {
-#  ifdef HAVE_PIXBUF
     if (pixbuf)
       g_object_unref (pixbuf);
+  }
+  int width ()
+  {
+    return gdk_pixbuf_get_width (pixbuf);
+  }
+  int height ()
+  {
+    return gdk_pixbuf_get_height (pixbuf);
+  }
 #  endif
-  }
-  int width ()
-  {
-#  ifdef HAVE_PIXBUF
-    return gdk_pixbuf_get_width (pixbuf);
-#  endif
-  }
-  int height ()
-  {
-#  ifdef HAVE_PIXBUF
-    return gdk_pixbuf_get_height (pixbuf);
-#  endif
-  }
   bool set_file (const char *file);
   bool set_geometry (const char *geom, bool update = false);
   void set_default_geometry ()
   {
     h_scale = v_scale = defaultScale;
 // that are not representable in unicode, as well as characters
 // not fitting in the BMP.
 struct compose_char
 {
   unicode_t c1, c2; // any chars != NOCHAR are valid
-  #if __cplusplus >= 201103L
+  #if __cplusplus >= 201103L || ECB_GCC_VERSION(4,4)
   compose_char () = default;
   #endif
   compose_char (unicode_t c1, unicode_t c2)
   : c1(c1), c2(c2)
   { }

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines