X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp_t.h;h=e19709812a389fa12e5b86b5178254c3aa2fc7fb;hb=493bdbad35484ae790f9d098c439048c95091d3f;hp=1212fb6593dc4ba3c9acd5b63f84c14e6d19aa06;hpb=d1de7107f847963fbce099597e6c42c2371b053c;p=libfirm

diff --git a/ir/be/becopyilp_t.h b/ir/be/becopyilp_t.h
index 1212fb659..e19709812 100644
--- a/ir/be/becopyilp_t.h
+++ b/ir/be/becopyilp_t.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -27,7 +27,6 @@
 #ifndef FIRM_BE_BECOPYILP_T_H
 #define FIRM_BE_BECOPYILP_T_H
 
-#include "firm_config.h"
 #include "firm_types.h"
 #include "pset.h"
 #include "becopyopt_t.h"
@@ -42,14 +41,14 @@
 
  *****************************************************************************/
 
-typedef struct _coloring_suffix_t coloring_suffix_t;
+typedef struct coloring_suffix_t coloring_suffix_t;
 
-struct _coloring_suffix_t {
+struct coloring_suffix_t {
 	coloring_suffix_t *next;
 	ir_node           *irn;
 };
 
-typedef struct _size_red_t {
+typedef struct size_red_t {
 	copy_opt_t        *co;
 	pset              *all_removed;   /**< All nodes removed during problem size reduction */
 	coloring_suffix_t *col_suff;      /**< Coloring suffix. Reverse would be a PEO prefix */
@@ -87,7 +86,7 @@ void free_size_red(size_red_t *sr);
  *       units (ou's) args could be merged and weights are accumulated.
  *       Is this necessary?
  */
-static INLINE int co_ilp_get_costs(copy_opt_t *co, ir_node *root, ir_node *arg) {
+static inline int co_ilp_get_costs(copy_opt_t *co, ir_node *root, ir_node *arg) {
 	int    i;
 	unit_t *curr;
 
@@ -118,22 +117,15 @@ static INLINE int co_ilp_get_costs(copy_opt_t *co, ir_node *root, ir_node *arg)
 
 #ifdef WITH_ILP
 #include <lpp/lpp.h>
-
-#define LPP_SOLVE_NET
-
-#ifdef LPP_SOLVE_NET
-#  include <lpp/lpp_net.h>
-#else
-#  include <lpp/lpp_cplex.h>
-#endif
+#include <lpp/lpp_net.h>
 
 #define EPSILON 0.00001
 
-typedef struct _ilp_env_t ilp_env_t;
+typedef struct ilp_env_t ilp_env_t;
 
 typedef void(*ilp_callback)(ilp_env_t*);
 
-struct _ilp_env_t {
+struct ilp_env_t {
 	const copy_opt_t *co;   /**< the copy opt problem */
 	size_red_t       *sr;   /**< problem size reduction. removes simple nodes */
 	lpp_t            *lp;   /**< the linear programming problem */
@@ -155,6 +147,6 @@ void free_ilp_env(ilp_env_t *ienv);
 #define name_cdd_sorted(buf, char1, int1, int2) \
 			name_cdd(buf, char1, MIN(int1, int2), MAX(int1, int2))
 
-#endif /* WITH_ILP */
+#endif
 
-#endif /* FIRM_BE_BECOPYILP_T_H */
+#endif