From de0f7ce2e88091c5636e3a616d00b8f7d36b8292 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Wed, 8 Dec 2004 16:23:13 +0000
Subject: [PATCH] fixed the double main problem.
---
src/partition_allocator/partition_allocator.c | 3 ++-
src/smap/smap.h | 4 ----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/partition_allocator/partition_allocator.c b/src/partition_allocator/partition_allocator.c
index 73613b33fc5..f3bf67bcfe2 100644
--- a/src/partition_allocator/partition_allocator.c
+++ b/src/partition_allocator/partition_allocator.c
@@ -1384,7 +1384,7 @@ static int _set_one_dim(int *start, int *end, int *coord)
}
return 1;
}
-
+#ifdef BUILD_EXE
/** */
int main(int argc, char** argv)
{
@@ -1514,3 +1514,4 @@ int main(int argc, char** argv)
return 0;
}
+#endif
diff --git a/src/smap/smap.h b/src/smap/smap.h
index 0341965e1b8..a1990197f2e 100644
--- a/src/smap/smap.h
+++ b/src/smap/smap.h
@@ -35,10 +35,6 @@
# include "config.h"
#endif
-#ifdef HAVE_BGL_FILES
-# include "rm_api.h"
-#endif
-
#include <pwd.h>
#include <ctype.h>
#include <stdio.h>
--
GitLab