* Updated header: Added 2006. Changed address of FSF. Changed email

[cacao.git] / src / vm / jit / inline / inline.c

diff --git a/src/vm/jit/inline/inline.c b/src/vm/jit/inline/inline.c
index 86a10e5d66d77bc9095d9ee400770d7674717d9f..6ca958d0a972fc5a4e9d9622a79508e36107db68 100644 (file)
--- a/src/vm/jit/inline/inline.c
+++ b/src/vm/jit/inline/inline.c
@@ -1,9 +1,9 @@
 /* src/vm/jit/inline/inline.c - code inliner
 
-   Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
-   R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
-   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
-   Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
+   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
+   J. Wenninger, Institut f. Computersprachen - TU Wien
 
    This file is part of CACAO.
 
@@ -19,16 +19,16 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
+   Contact: cacao@cacaojvm.org
 
    Authors: Dieter Thuernbeck
 
    Changes: Christian Thalinger
 
-   $Id: inline.c 4302 2006-01-19 20:00:11Z twisti $
+   $Id: inline.c 4357 2006-01-22 23:33:38Z twisti $
 
 */
 
@@ -148,13 +148,6 @@ void inlining_setup(methodinfo *m, t_inlining_globals *inline_env)
 /*     t_inlining_globals *inline_env = DNEW(t_inlining_globals); */
         inlining_init0(m,inline_env);
 
-/* define in options.h; Used in main.c, jit.c & inline.c */
-#ifdef INAFTERMAIN
-if ((utf_new_char("main") == m->name) && (useinliningm)) {
-       useinlining = true;
-       }
-#endif
-
 if (useinlining)
         {
                #ifdef DEBUGi