Fix so that libvpsc can be built on Windows.

diff --git a/lib/vpsc/csolve_VPSC.h b/lib/vpsc/csolve_VPSC.h
index e916bb76b0a2ee0feaa2cd8ac5b9bb0b6e7ea724..1bbacbea896264130f97bb7a401a55580267d40b 100644 (file)
--- a/lib/vpsc/csolve_VPSC.h
+++ b/lib/vpsc/csolve_VPSC.h
@@ -22,15 +22,27 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+#ifdef __cplusplus
+class Variable;
+#else
 typedef struct Variable Variable;
+#endif
 Variable* newVariable(int id, double desiredPos, double weight);
 void setVariableDesiredPos(Variable *, double desiredPos);
 double getVariablePos(Variable*);
 
+#ifdef __cplusplus
+class Constraint;
+#else
 typedef struct Constraint Constraint;
+#endif
 Constraint* newConstraint(Variable* left, Variable* right, double gap);
 
+#ifdef __cplusplus
+class VPSC;
+#else
 typedef struct VPSC VPSC;
+#endif
 VPSC* newVPSC(int n, Variable* vs[], int m, Constraint* cs[]);
 void deleteVPSC(VPSC*);
 void deleteConstraint(Constraint*);
@@ -53,7 +65,11 @@ int genYConstraints(int n, boxf[], Variable** vs, Constraint*** cs);
 
 void satisfyVPSC(VPSC*);
 void solveVPSC(VPSC*);
+#ifdef __cplusplus
+class IncVPSC;
+#else
 typedef struct IncVPSC IncVPSC;
+#endif
 VPSC* newIncVPSC(int n, Variable* vs[], int m, Constraint* cs[]);
 void splitIncVPSC(IncVPSC*);
 int getSplitCnt(IncVPSC *vpsc);