Created
May 16, 2011 21:35
-
-
Save bringhurst/975422 to your computer and use it in GitHub Desktop.
A patch to remove a weak linking hack for some old version of osx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/plugins/select/cons_res/select_cons_res.c b/src/plugins/select/cons_res/select_cons_res.c | |
index f138c04..40be7d2 100644 | |
--- a/src/plugins/select/cons_res/select_cons_res.c | |
+++ b/src/plugins/select/cons_res/select_cons_res.c | |
@@ -109,22 +109,6 @@ | |
#define NODEINFO_MAGIC 0x82aa | |
-/* These are defined here so when we link with something other than | |
- * the slurmctld we will have these symbols defined. They will get | |
- * overwritten when linking with the slurmctld. | |
- */ | |
-#if defined (__APPLE__) | |
-slurm_ctl_conf_t slurmctld_conf __attribute__((weak_import)); | |
-struct node_record *node_record_table_ptr __attribute__((weak_import)); | |
-List part_list __attribute__((weak_import)); | |
-List job_list __attribute__((weak_import)); | |
-int node_record_count __attribute__((weak_import)); | |
-time_t last_node_update __attribute__((weak_import)); | |
-struct switch_record *switch_record_table __attribute__((weak_import)); | |
-int switch_record_cnt __attribute__((weak_import)); | |
-bitstr_t *avail_node_bitmap __attribute__((weak_import)); | |
-bitstr_t *idle_node_bitmap __attribute__((weak_import)); | |
-#else | |
slurm_ctl_conf_t slurmctld_conf; | |
struct node_record *node_record_table_ptr; | |
List part_list; | |
@@ -135,7 +119,6 @@ struct switch_record *switch_record_table; | |
int switch_record_cnt; | |
bitstr_t *avail_node_bitmap; | |
bitstr_t *idle_node_bitmap; | |
-#endif | |
/* | |
* These variables are required by the generic plugin interface. If they |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment