Use trusty

[nlopt.git] / api / f77funcs.h

diff --git a/api/f77funcs.h b/api/f77funcs.h
index 2e41e297f9f46947ddd891a1b6b99d0d39225e42..332b16bc19c4d17dd27140d505482af447842049 100644 (file)
--- a/api/f77funcs.h
+++ b/api/f77funcs.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2010 Massachusetts Institute of Technology
+/* Copyright (c) 2007-2014 Massachusetts Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -55,8 +55,8 @@ void F77(nloptc,NLOPTC)(int *info,
      }
 
      *info = nlopt_minimize_constrained((nlopt_algorithm) *algorithm, 
-                                       *n, f77_func_wrap, &d,
-                                       *m, f77_func_wrap, 
+                                       *n, f77_func_wrap_old, &d,
+                                       *m, f77_func_wrap_old, 
                                        dc, sizeof(f77_func_data),
                                        lb, ub, x, minf,
                                        *minf_max, *ftol_rel, *ftol_abs,
@@ -80,7 +80,7 @@ void F77(nloptm,NLOPTM)(int *info,
                        const int *maxeval, const double *maxtime)
 {
      int m = 0;
-     F77(nloptc,NLOPTC)(info, algorithm, n, f, f_data, &m, 0, 0, 0,
+     F77CALL(nloptc,NLOPTC)(info, algorithm, n, f, f_data, &m, 0, 0, 0,
                        lb, ub, x, minf, minf_max, ftol_rel, ftol_abs,
                        xtol_rel, xtol_abs, have_xtol_abs, maxeval, maxtime);
 }
@@ -112,3 +112,7 @@ void F77(nlossp,NLOSSP)(const int *pop)
 {
      nlopt_set_stochastic_population(*pop);
 }
+
+#define F77_(name,NAME) F77(name,NAME)
+# include "f77funcs_.h"
+#undef F77_