oosplash: remove redundant mac conditionals - we don't build on OS/X
This commit is contained in:
parent
a97b76604f
commit
3f40276194
2 changed files with 0 additions and 18 deletions
|
@ -101,22 +101,10 @@ int file_image_pagein (file_image * image)
|
|||
return (0);
|
||||
|
||||
if (madvise (w.m_base, w.m_size, MADV_WILLNEED) == -1)
|
||||
{
|
||||
#ifndef MACOSX
|
||||
return (errno);
|
||||
#else
|
||||
/* madvise MADV_WILLNEED need not succeed here */
|
||||
/* but that is fine */
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
#ifndef MACOSX
|
||||
if ((s = sysconf (_SC_PAGESIZE)) == -1)
|
||||
s = 0x1000;
|
||||
#else
|
||||
s = getpagesize();
|
||||
#endif
|
||||
|
||||
k = (size_t)(s);
|
||||
while (w.m_size > k)
|
||||
|
|
|
@ -624,7 +624,6 @@ system_checks( void )
|
|||
/* re-use the pagein code */
|
||||
extern int pagein_execute (int argc, char **argv);
|
||||
|
||||
#ifndef MACOSX
|
||||
static char *build_pagein_path (Args *args, const char *pagein_name)
|
||||
{
|
||||
char *path;
|
||||
|
@ -642,15 +641,11 @@ static char *build_pagein_path (Args *args, const char *pagein_name)
|
|||
|
||||
return path;
|
||||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
exec_pagein (Args *args)
|
||||
{
|
||||
// no pagein for the while on OSX
|
||||
#ifdef MACOSX
|
||||
(void)args;
|
||||
#else
|
||||
char *argv[3];
|
||||
|
||||
/* don't use -L - since that does a chdir that breaks relative paths */
|
||||
|
@ -666,7 +661,6 @@ exec_pagein (Args *args)
|
|||
if (argv[2])
|
||||
free (argv[2]);
|
||||
free (argv[1]);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void extend_library_path (const char *new_element)
|
||||
|
|
Loading…
Reference in a new issue