Mercurial > mxe-octave

annotate src/octave-2-fixes.patch @ 2938:d69349f4d818

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
temporary fix for octave sysdep_init
author John W. Eaton <jwe@octave.org>
date Thu, 03 Jan 2013 03:19:53 -0500
parents
children 4b484be8aaf3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2938
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 --- a/libinterp/octave.cc
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 +++ b/libinterp/octave.cc
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 @@ -656,6 +656,8 @@
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 {
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 octave_process_command_line (argc, argv);
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7 + sysdep_init ();
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 +
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 install_defaults ();
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 octave_initialize_interpreter (argc, argv, embedded);
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 @@ -861,8 +863,6 @@
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 init_signals ();
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16 - sysdep_init ();
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 -
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 octave_ieee_init ();
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 // The idea here is to force xerbla to be referenced so that we will
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21 diff --git a/src/Makefile.am b/src/Makefile.am
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22 --- a/src/Makefile.am
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 +++ b/src/Makefile.am
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 @@ -27,7 +27,7 @@
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25 -I$(top_srcdir)/liboctave/numeric \
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 -I$(top_srcdir)/liboctave/util \
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27 -I$(top_srcdir)/libinterp \
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 - -I$(top_builddir)/libinterp/interpfcn \
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29 + -I$(top_builddir)/libinterp/interpfcn -I$(top_srcdir)/libinterp/interpfcn \
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 -I$(top_builddir)/libgnu -I$(top_srcdir)/libgnu
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32 AM_CFLAGS += $(WARN_CFLAGS)
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33 diff --git a/src/main-cli.cc b/src/main-cli.cc
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34 --- a/src/main-cli.cc
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
35 +++ b/src/main-cli.cc
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
36 @@ -26,12 +26,15 @@
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
37
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38 #include "defaults.h"
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
39 #include "octave.h"
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
40 +#include "sysdep.h"
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
41
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
42 int
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
43 main (int argc, char **argv)
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
44 {
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
45 octave_process_command_line (argc, argv);
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
46
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
47 + sysdep_init ();
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
48 +
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49 install_defaults ();
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
50
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
51 octave_initialize_interpreter (argc, argv, 0);
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
52 diff --git a/src/main.cc b/src/main.cc
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
53 --- a/src/main.cc
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
54 +++ b/src/main.cc
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
55 @@ -27,6 +27,7 @@
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
56 #include "defaults.h"
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
57 #include "octave.h"
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
58 #include "octave-gui.h"
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
59 +#include "sysdep.h"
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
60
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
61 int
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
62 main (int argc, char **argv)
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
63 @@ -35,6 +36,8 @@
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
64
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
65 octave_process_command_line (argc, argv);
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
66
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
67 + sysdep_init ();
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
68 +
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
69 install_defaults ();
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
70
d69349f4d818 temporary fix for octave sysdep_init
John W. Eaton <jwe@octave.org>
parents:
diff changeset
71 if (octave_starting_gui ())