Version abc80702

1 files changed, 22 insertions, 26 deletions

diff --git a/src/misc/espresso/espresso.h b/src/misc/espresso/espresso.h
index 1c7a8646..3ca331ac 100644
--- a/src/misc/espresso/espresso.h
+++ b/src/misc/espresso/espresso.h
@@ -546,7 +546,7 @@ extern struct cdata_struct cdata, temp_cdata_save;
 /* cubestr.c */    extern void restore_cube_struct();
 /* cubestr.c */    extern void save_cube_struct();
 /* cubestr.c */    extern void setdown_cube();
-/* cvrin.c */    extern PLA_labels();
+/* cvrin.c */    extern void PLA_labels();
 /* cvrin.c */    extern char *get_word();
 /* cvrin.c */    extern int label_index();
 /* cvrin.c */    extern int read_pla();
@@ -557,7 +557,7 @@ extern struct cdata_struct cdata, temp_cdata_save;
 /* cvrin.c */    extern void parse_pla();
 /* cvrin.c */    extern void read_cube();
 /* cvrin.c */    extern void skip_line();
-/* cvrm.c */    extern foreach_output_function();
+/* cvrm.c */    extern void foreach_output_function();
 /* cvrm.c */    extern int cubelist_partition();
 /* cvrm.c */    extern int so_both_do_espresso();
 /* cvrm.c */    extern int so_both_do_exact();
@@ -590,10 +590,10 @@ extern struct cdata_struct cdata, temp_cdata_save;
 /* cvrout.c */    extern char *pc1();
 /* cvrout.c */    extern char *pc2();
 /* cvrout.c */    extern char *pc3();
-/* cvrout.c */    extern int makeup_labels();
-/* cvrout.c */    extern kiss_output();
-/* cvrout.c */    extern kiss_print_cube();
-/* cvrout.c */    extern output_symbolic_constraints();
+/* cvrout.c */    extern void makeup_labels();
+/* cvrout.c */    extern void kiss_output();
+/* cvrout.c */    extern void kiss_print_cube();
+/* cvrout.c */    extern void output_symbolic_constraints();
 /* cvrout.c */    extern void cprint();
 /* cvrout.c */    extern void debug1_print();
 /* cvrout.c */    extern void debug_print();
@@ -606,7 +606,7 @@ extern struct cdata_struct cdata, temp_cdata_save;
 /* cvrout.c */    extern void print_cube();
 /* cvrout.c */    extern void print_expanded_cube();
 /* cvrout.c */    extern void sf_debug_print();
-/* equiv.c */    extern find_equiv_outputs();
+/* equiv.c */    extern void find_equiv_outputs();
 /* equiv.c */    extern int check_equiv();
 /* espresso.c */    extern pcover espresso();
 /* essen.c */    extern bool essen_cube();
@@ -633,14 +633,14 @@ extern struct cdata_struct cdata, temp_cdata_save;
 /* gasp.c */    extern pcover super_gasp();
 /* gasp.c */    extern void expand1_gasp();
 /* getopt.c */    extern int util_getopt();
-/* hack.c */    extern find_dc_inputs();
-/* hack.c */    extern find_inputs();
-/* hack.c */    extern form_bitvector();
-/* hack.c */    extern map_dcset();
-/* hack.c */    extern map_output_symbolic();
-/* hack.c */    extern map_symbolic();
+/* hack.c */    extern void find_dc_inputs();
+/* hack.c */    extern void find_inputs();
+/* hack.c */    extern void form_bitvector();
+/* hack.c */    extern void map_dcset();
+/* hack.c */    extern void map_output_symbolic();
+/* hack.c */    extern void map_symbolic();
 /* hack.c */    extern pcover map_symbolic_cover();
-/* hack.c */    extern symbolic_hack_labels();
+/* hack.c */    extern void symbolic_hack_labels();
 /* irred.c */    extern bool cube_is_covered();
 /* irred.c */    extern bool taut_special_cases();
 /* irred.c */    extern bool tautology();
@@ -651,7 +651,7 @@ extern struct cdata_struct cdata, temp_cdata_save;
 /* map.c */    extern pset minterms();
 /* map.c */    extern void explode();
 /* map.c */    extern void map();
-/* opo.c */    extern output_phase_setup();
+/* opo.c */    extern void output_phase_setup();
 /* opo.c */    extern pPLA set_phase();
 /* opo.c */    extern pcover opo();
 /* opo.c */    extern pcube find_phase();
@@ -662,19 +662,19 @@ extern struct cdata_struct cdata, temp_cdata_save;
 /* opo.c */    extern void opoall();
 /* opo.c */    extern void phase_assignment();
 /* opo.c */    extern void repeated_phase_assignment();
-/* pair.c */    extern generate_all_pairs();
+/* pair.c */    extern void generate_all_pairs();
 /* pair.c */    extern int **find_pairing_cost();
-/* pair.c */    extern int find_best_cost();
+/* pair.c */    extern void find_best_cost();
 /* pair.c */    extern int greedy_best_cost();
-/* pair.c */    extern int minimize_pair();
-/* pair.c */    extern int pair_free();
-/* pair.c */    extern pair_all();
+/* pair.c */    extern void minimize_pair();
+/* pair.c */    extern void pair_free();
+/* pair.c */    extern void pair_all();
 /* pair.c */    extern pcover delvar();
 /* pair.c */    extern pcover pairvar();
 /* pair.c */    extern ppair pair_best_cost();
 /* pair.c */    extern ppair pair_new();
 /* pair.c */    extern ppair pair_save();
-/* pair.c */    extern print_pair();
+/* pair.c */    extern void print_pair();
 /* pair.c */    extern void find_optimal_pairing();
 /* pair.c */    extern void set_pair();
 /* pair.c */    extern void set_pair1();
@@ -764,10 +764,6 @@ extern struct cdata_struct cdata, temp_cdata_save;
 /* sminterf.c */pset do_sm_minimum_cover();
 /* sparse.c */    extern pcover make_sparse();
 /* sparse.c */    extern pcover mv_reduce();
-#if !defined(__osf__) && !defined(__STDC__) && !defined(__hpux)
-/* ucbqsort.c */    extern qsort();
-#endif
-/* ucbqsort.c */    extern qst();
 /* unate.c */    extern pcover find_all_minimal_covers_petrick();
 /* unate.c */    extern pcover map_cover_to_unate();
 /* unate.c */    extern pcover map_unate_to_cover();
@@ -776,7 +772,7 @@ extern struct cdata_struct cdata, temp_cdata_save;
 /* unate.c */    extern pset_family unate_compl();
 /* unate.c */    extern pset_family unate_complement();
 /* unate.c */    extern pset_family unate_intersect();
-/* verify.c */    extern PLA_permute();
+/* verify.c */    extern void PLA_permute();
 /* verify.c */    extern bool PLA_verify();
 /* verify.c */    extern bool check_consistency();
 /* verify.c */    extern bool verify();