Mercurial Mercurial > upstream > oracle > spec-files / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/evolution-data-server-05-comm-err.diff
author yippi
Mon, 27 Sep 2010 21:07:51 +0000
changeset 20108 51df67ca9307
parent 17934 a2a06609d9f0
permissions -rw-r--r--
I had these modules listed as being owned by me, but they are really owned by wangke, correcting.

diff -ruN evolution-data-server-2.30.1.orig/camel/camel-sasl-gssapi.c evolution-data-server-2.30.1/camel/camel-sasl-gssapi.c
--- evolution-data-server-2.30.1.orig/camel/camel-sasl-gssapi.c	2010-04-26 20:00:55.232977746 +0100
+++ evolution-data-server-2.30.1/camel/camel-sasl-gssapi.c	2010-04-26 20:04:04.341377459 +0100
@@ -31,18 +31,7 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#ifdef HAVE_HEIMDAL_KRB5
-#include <krb5.h>
-#else
-#include <krb5/krb5.h>
-#endif
-#ifdef HAVE_ET_COM_ERR_H
-#include <et/com_err.h>
-#else
-#ifdef HAVE_COM_ERR_H
-#include <com_err.h>
-#endif
-#endif
+#include <kerberosv5/krb5.h>
 #ifdef HAVE_MIT_KRB5
 #include <gssapi/gssapi.h>
 #include <gssapi/gssapi_generic.h>
upstream/oracle/spec-files