view src/libgsf-1-fixes.patch @ 1220:7e21c525c51f

combined patch files
author Mark Brand <mabrand@mabrand.nl>
date Wed, 29 Sep 2010 20:19:18 +0200
parents
children b2d6ef366242
line wrap: on
line source

This file is part of mingw-cross-env.
See doc/index.html for further information.

Contains ad hoc patches for cross building.

From f2970c9c697dd6a6104495ea91ed2488ead297b7 Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Fri, 24 Sep 2010 23:34:26 +0200
Subject: [PATCH 1/2] s,DllMain,static _disabled_DllMain,


diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c
index d7a7247..cc52d99 100644
--- a/gsf/gsf-utils.c
+++ b/gsf/gsf-utils.c
@@ -119,9 +119,9 @@ static GTypeModule *static_type_module = NULL;
 #include <windows.h>
 static HMODULE gsf_dll_hmodule;
 BOOL WINAPI
-DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
+static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved);
 BOOL WINAPI
-DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved)
+static _disabled_DllMain (HINSTANCE hinstDLL, DWORD fdwReason, G_GNUC_UNUSED LPVOID lpvReserved)
 {
 	if (fdwReason == DLL_PROCESS_ATTACH) gsf_dll_hmodule = hinstDLL;
 	return TRUE;
-- 
1.7.1


From ab87b1b623f774244935bf9f1d82365a3203d8db Mon Sep 17 00:00:00 2001
From: mingw-cross-env
Date: Wed, 29 Sep 2010 20:15:48 +0200
Subject: [PATCH 2/2] no gettext


diff --git a/configure.in b/configure.in
index af40c28..7ce5f7b 100644
--- a/configure.in
+++ b/configure.in
@@ -53,10 +53,6 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
 dnl Gettext/i18n stuff
 
-IT_PROG_INTLTOOL([0.35.0])
-
-AM_GLIB_GNU_GETTEXT
-
 GETTEXT_PACKAGE=AC_PACKAGE_NAME
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
-- 
1.7.1