summaryrefslogtreecommitdiffstats
path: root/perl-install/c
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-09-09 09:53:25 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-09-09 09:53:25 +0000
commit14d4659ed34b4a4883b7d54ce0a3ed7c814d264d (patch)
tree437ebd1f4cc57fda26cedc4dc66f5ebb272cac14 /perl-install/c
parentab7170507346c8ebb28e4b4bfe9a0713dd0e591c (diff)
downloaddrakx-14d4659ed34b4a4883b7d54ce0a3ed7c814d264d.tar
drakx-14d4659ed34b4a4883b7d54ce0a3ed7c814d264d.tar.gz
drakx-14d4659ed34b4a4883b7d54ce0a3ed7c814d264d.tar.bz2
drakx-14d4659ed34b4a4883b7d54ce0a3ed7c814d264d.tar.xz
drakx-14d4659ed34b4a4883b7d54ce0a3ed7c814d264d.zip
max() is not defined, inline it
Diffstat (limited to 'perl-install/c')
-rw-r--r--perl-install/c/smp-dmi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/c/smp-dmi.c b/perl-install/c/smp-dmi.c
index c42f83a9c..241d8f464 100644
--- a/perl-install/c/smp-dmi.c
+++ b/perl-install/c/smp-dmi.c
@@ -296,5 +296,7 @@ int intelDetectSMP(void) {
}
int dmiDetectMemory(void) {
- return max(dmi_detect(memory_in_MB_type6), dmi_detect(memory_in_MB_type17));
+ int s1 = dmi_detect(memory_in_MB_type6);
+ int s2 = dmi_detect(memory_in_MB_type17);
+ return s1 > s2 ? s1 : s2;
}