Mercurial > hg > truffle

comparison src/share/vm/prims/nativeLookup.cpp @ 14521:29ccc4cbabca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 12 Mar 2014 13:30:08 +0100
parents d8041d695d19
children 4ca6dc0799b6
comparison
equal deleted inserted replaced
14520:f84115370178 14521:29ccc4cbabca
1 /* 1 /*
2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
48 # include "os_solaris.inline.hpp" 48 # include "os_solaris.inline.hpp"
49 #endif 49 #endif
50 #ifdef TARGET_OS_FAMILY_windows 50 #ifdef TARGET_OS_FAMILY_windows
51 # include "os_windows.inline.hpp" 51 # include "os_windows.inline.hpp"
52 #endif 52 #endif
53 #ifdef TARGET_OS_FAMILY_aix
54 # include "os_aix.inline.hpp"
55 #endif
53 #ifdef TARGET_OS_FAMILY_bsd 56 #ifdef TARGET_OS_FAMILY_bsd
54 # include "os_bsd.inline.hpp" 57 # include "os_bsd.inline.hpp"
55 #endif 58 #endif
56 59
57 60