[Libreoffice-commits] .: glib/glib-2.28.1-win32.patch

[Libreoffice Gerrit user]

 glib/glib-2.28.1-win32.patch |   40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

New commits:
commit a5036f396aadb44e44844ad2c784ee521eeda55a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Sep 12 10:07:32 2012 +0200

    Patch line end clean up
    
    Change-Id: I8f20800584d864b8fa9789b0ffab6b62db232632

diff --git a/glib/glib-2.28.1-win32.patch b/glib/glib-2.28.1-win32.patch
index 3089f93..7cfd09b 100644
--- a/glib/glib-2.28.1-win32.patch
+++ b/glib/glib-2.28.1-win32.patch
@@ -586,12 +586,12 @@
  
  gmodule_OBJECTS = \
  	gmodule.obj
--gmodule.def: gmodule.symbols
--	echo EXPORTS > gmodule.def
--	cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES \
--		-DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= \
--		-DG_GNUC_PRINTF=;G_GNUC_PRINTF gmodule.symbols >> gmodule.def
--
+-gmodule.def: gmodule.symbols
+-	echo EXPORTS > gmodule.def
+-	cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES \
+-		-DG_GNUC_MALLOC= -DG_GNUC_CONST= -DG_GNUC_NULL_TERMINATED= -DG_GNUC_NORETURN= \
+-		-DG_GNUC_PRINTF=;G_GNUC_PRINTF gmodule.symbols >> gmodule.def
+-
 +gmodule.def: gmodule.symbols
 +	echo EXPORTS > gmodule.def
 +	cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS -DALL_FILES \
@@ -1978,17 +1978,17 @@
 +
 --- misc/glib-2.28.1/gobject/gmarshal.c	Wed Aug 20 14:33:55 2008
 +++ misc/build/glib-2.28.1/gobject/gmarshal.c	Wed Aug 20 14:26:42 2008
-@@ -1,4 +1,13 @@
-+#include "config.h"
- 
-+#include "gsourceclosure.h"
-+#include "gboxed.h"
-+#include "genums.h"
-+#include "gmarshal.h"
-+#include "gvalue.h"
-+#include "gvaluetypes.h"
-+#include "gparam.h"
-+#include "gobject.h"
- 
- #ifdef G_ENABLE_DEBUG
- #define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
+@@ -1,4 +1,13 @@
++#include "config.h"
+ 
++#include "gsourceclosure.h"
++#include "gboxed.h"
++#include "genums.h"
++#include "gmarshal.h"
++#include "gvalue.h"
++#include "gvaluetypes.h"
++#include "gparam.h"
++#include "gobject.h"
+ 
+ #ifdef G_ENABLE_DEBUG
+ #define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)