Hi,

while trying to install a fresh new efl stack on an old Fedora 10, I
got stuck on two errors that I could fix quite easliy.
Please review and apply if possible...

- eina: the __gnu_printf__ format attribute is only valid since GCC
4.4. However, we can find __printf__ format before. I'm not sure they
are equivalent though, so any hints on the fix appreciated... (tested
with GCC 4.3.4)

- eet: the md variable in eet_cipher.c is only defined when using the
new gnutls api. Thus adding guards to the code that cedric moved.

Kind regards,
Lionel
Index: src/include/eina_types.h
===================================================================
--- src/include/eina_types.h	(revision 68172)
+++ src/include/eina_types.h	(working copy)
@@ -124,7 +124,7 @@
 # endif
 
 # if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
-#  define EINA_PRINTF(fmt, arg) __attribute__((__format__ (__gnu_printf__, fmt, arg)))
+#  define EINA_PRINTF(fmt, arg) __attribute__((__format__ (__printf__, fmt, arg)))
 #  define EINA_SCANF(fmt, arg)  __attribute__((__format__ (__scanf__, fmt, arg)))
 #  define EINA_FORMAT(fmt)      __attribute__((__format_arg__(fmt)))
 #  define EINA_CONST        __attribute__((__const__))
@@ -141,6 +141,11 @@
 #  define EINA_LIKELY(exp)   exp
 # endif
 
+# if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 3)
+#  undef  EINA_PRINTF
+#  define EINA_PRINTF(fmt, arg) __attribute__((__format__ (__gnu_printf__, fmt, arg)))
+# endif
+
 #elif defined(_WIN32)
 # define EINA_WARN_UNUSED_RESULT
 # define EINA_ARG_NONNULL(idx, ...)
Index: src/lib/eet_cipher.c
===================================================================
--- src/lib/eet_cipher.c	(revision 68172)
+++ src/lib/eet_cipher.c	(working copy)
@@ -857,9 +857,11 @@
 
    return cert_der;
 # ifdef HAVE_GNUTLS
+#  if EET_USE_NEW_GNUTLS_API
  on_error:
    gcry_md_close(md);
    return NULL;
+#  endif
 # endif
 #else /* ifdef HAVE_SIGNATURE */
    data_base = NULL;
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Reply via email to