* Minor cleanup.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36299 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
e486a4d0dc
commit
87e256c2e8
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2006-2008, Haiku, Inc. All Rights Reserved.
|
* Copyright 2006-2010, Haiku, Inc. All Rights Reserved.
|
||||||
* Distributed under the terms of the MIT License.
|
* Distributed under the terms of the MIT License.
|
||||||
*
|
*
|
||||||
* Authors:
|
* Authors:
|
||||||
@ -45,12 +45,12 @@ find_own_image()
|
|||||||
extern "C" void
|
extern "C" void
|
||||||
initialize_before()
|
initialize_before()
|
||||||
{
|
{
|
||||||
// determine if we have to run in R5 compatibility mode
|
// determine if we have to run in BeOS compatibility mode
|
||||||
|
|
||||||
// get image of executable
|
// get image of executable
|
||||||
image_info info;
|
image_info info;
|
||||||
uint32 cookie = 0;
|
uint32 cookie = 0;
|
||||||
if (get_next_image_info(B_CURRENT_TEAM, (int32 *)&cookie, &info) != B_OK)
|
if (get_next_image_info(B_CURRENT_TEAM, (int32*)&cookie, &info) != B_OK)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (get_image_symbol(info.id, "__gHaikuStartupCode", B_SYMBOL_TYPE_DATA,
|
if (get_image_symbol(info.id, "__gHaikuStartupCode", B_SYMBOL_TYPE_DATA,
|
||||||
@ -60,7 +60,7 @@ initialize_before()
|
|||||||
}
|
}
|
||||||
|
|
||||||
// We're using the BeOS startup code, check if BONE libraries are in
|
// We're using the BeOS startup code, check if BONE libraries are in
|
||||||
// use, and if not, enable the R5 compatibility layer.
|
// use, and if not, enable the BeOS R5 compatibility layer.
|
||||||
// As dependencies to network libraries may be "hidden" in libraries, we
|
// As dependencies to network libraries may be "hidden" in libraries, we
|
||||||
// may have to scan not only the executable, but every loaded image.
|
// may have to scan not only the executable, but every loaded image.
|
||||||
int enable = 0;
|
int enable = 0;
|
||||||
@ -85,7 +85,6 @@ initialize_before()
|
|||||||
debug_printf("libnetwork.so running in R5 compatibility mode.\n");
|
debug_printf("libnetwork.so running in R5 compatibility mode.\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} while(enable == 0
|
} while (enable == 0
|
||||||
&& get_next_image_info(B_CURRENT_TEAM, (int32 *)&cookie, &info)
|
&& get_next_image_info(B_CURRENT_TEAM, (int32*)&cookie, &info) == B_OK);
|
||||||
== B_OK);
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user