mirror of https://git.wownero.com/dsc/mxe.git
Merge remote-tracking branch 'mxe/master' into work
This commit is contained in:
commit
d45234fed8
|
@ -702,7 +702,7 @@ USE_OSGPLUGIN(<plugin2>)
|
||||||
|
|
||||||
<!-- http://www.debian.org/distrib/packages#search_packages -->
|
<!-- http://www.debian.org/distrib/packages#search_packages -->
|
||||||
<pre>apt-get install \
|
<pre>apt-get install \
|
||||||
autoconf automake bash bison bzip2 cmake flex gettext \
|
autoconf automake autopoint bash bison bzip2 cmake flex gettext \
|
||||||
git g++ gperf intltool libffi-dev libtool libltdl-dev \
|
git g++ gperf intltool libffi-dev libtool libltdl-dev \
|
||||||
libssl-dev libxml-parser-perl make openssl patch perl \
|
libssl-dev libxml-parser-perl make openssl patch perl \
|
||||||
pkg-config python ruby scons sed unzip wget xz-utils</pre>
|
pkg-config python ruby scons sed unzip wget xz-utils</pre>
|
||||||
|
|
|
@ -53,6 +53,15 @@ diff -r 62cf992c82c9 reimp/reimp.c
|
||||||
{
|
{
|
||||||
struct ar_hdr ar_hdr;
|
struct ar_hdr ar_hdr;
|
||||||
struct imp_hdr imp_hdr;
|
struct imp_hdr imp_hdr;
|
||||||
|
@@ -410,7 +410,7 @@
|
||||||
|
extract_member (get_ar_name (&ar_hdr),
|
||||||
|
strtol (ar_hdr.ar_size, NULL, 10), f);
|
||||||
|
}
|
||||||
|
- return;
|
||||||
|
+ return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
sym = buf = xmalloc (imp_hdr.size);
|
||||||
diff -r 62cf992c82c9 reimp/reimp.h
|
diff -r 62cf992c82c9 reimp/reimp.h
|
||||||
--- a/reimp/reimp.h Fri Nov 26 19:02:28 2010 +0100
|
--- a/reimp/reimp.h Fri Nov 26 19:02:28 2010 +0100
|
||||||
+++ b/reimp/reimp.h Fri Nov 26 19:14:59 2010 +0100
|
+++ b/reimp/reimp.h Fri Nov 26 19:14:59 2010 +0100
|
||||||
|
|
Loading…
Reference in New Issue