diff -r 72ba5129e5fd -r f20576d5885a mozilla-kde.patch --- a/mozilla-kde.patch Wed Jul 09 14:56:22 2014 +0200 +++ b/mozilla-kde.patch Sun Sep 14 21:55:52 2014 +0200 @@ -2719,11 +2719,14 @@ new file mode 100644 --- /dev/null +++ b/uriloader/exthandler/unix/nsCommonRegistry.h -@@ -0,0 +1,23 @@ +@@ -0,0 +1,28 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + ++#ifndef nsCommonRegistry_h__ ++#define nsCommonRegistry_h__ ++ +#include "nsIURI.h" +#include "nsCOMPtr.h" + @@ -2743,6 +2746,8 @@ + + static already_AddRefed GetFromType(const nsACString& aMIMEType); +}; ++ ++#endif diff --git a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/unix/nsKDERegistry.cpp new file mode 100644 --- /dev/null @@ -2840,11 +2845,14 @@ new file mode 100644 --- /dev/null +++ b/uriloader/exthandler/unix/nsKDERegistry.h -@@ -0,0 +1,29 @@ +@@ -0,0 +1,34 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + ++#ifndef nsKDERegistry_h__ ++#define nsKDERegistry_h__ ++ +#include "nsIURI.h" +#include "nsCOMPtr.h" +#include "nsTArray.h" @@ -2870,6 +2878,8 @@ + static already_AddRefed GetFromHelper(const nsTArray& command); + +}; ++ ++#endif //nsKDERegistry_h__ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp