summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2011-11-08 11:33:30 +0000
committerMichael Meeks <michael.meeks@suse.com>2011-11-08 12:36:08 +0000
commit3f40276194c9dc06739d7aaae3a3dc64bfe18bc5 (patch)
tree1d303b3530cb06bb5d877bdea54b3270a14ebf6c /desktop
parenta97b76604fbfa54f73427ca1aed0ec3b3cb256e1 (diff)
oosplash: remove redundant mac conditionals - we don't build on OS/X
Diffstat (limited to 'desktop')
-rw-r--r--desktop/unx/source/file_image_unx.c12
-rw-r--r--desktop/unx/source/start.c6
2 files changed, 0 insertions, 18 deletions
diff --git a/desktop/unx/source/file_image_unx.c b/desktop/unx/source/file_image_unx.c
index fa1af9248d60..078585f097f7 100644
--- a/desktop/unx/source/file_image_unx.c
+++ b/desktop/unx/source/file_image_unx.c
@@ -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)
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index b22f10f12c9b..29cda81f37b6 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -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)