Mercurial > mxe-octave

changeset 620:7c3421e06e57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improved solution to avoid redefinition of INT32 in package jpeg
author Volker Grabsch <vog@notjusthosting.com>
date Wed, 23 Dec 2009 22:33:39 +0100
parents 837543941a27
children 544548c7cae9
files src/jpeg.mk
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/jpeg.mk	Tue Dec 22 04:07:03 2009 +0100
+++ b/src/jpeg.mk	Wed Dec 23 22:33:39 2009 +0100
@@ -38,7 +38,7 @@
 
 define $(PKG)_BUILD
     # avoid redefinition of INT32
-    $(SED) 's,#ifndef XMD_H,#if (!defined(XMD_H) \&\& !defined(_BASETSD_H)),' -i '$(1)/jmorecfg.h'
+    $(SED) 's,typedef long INT32;,#include <basetsd.h>,' -i '$(1)/jmorecfg.h'
     cd '$(1)' && ./configure \
         CC='$(TARGET)-gcc' RANLIB='$(TARGET)-ranlib' \
         --disable-shared \