Merge pull request #200 from epitavy/cpp-include-support

Cpp include support

Author: ederc

configure.ac

@@ -10,6 +10,10 @@ AC_CONFIG_MACRO_DIR([m4])
 
 AM_MAINTAINER_MODE
 
+# Enable non standard exensions by defining macros such as _GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
+
+
 AM_PROG_AR
 LT_INIT
 

src/msolve/main.c

@@ -117,7 +117,7 @@ static inline void display_help(char *str){
   fprintf(stdout, "         first (n - NF) elements generate already a degree reverse\n");
   fprintf(stdout, "         lexicographical Gröbner basis.\n");
   fprintf(stdout, "-p PRE   Precision of the real root isolation.\n");
-  fprintf(stdout, "         Default is 32.\n");
+  fprintf(stdout, "         Default is 128.\n");
   fprintf(stdout, "-P PAR   Get also rational parametrization of solution set.\n");
   fprintf(stdout, "         Default is 0. For a detailed description of the output\n");
   fprintf(stdout, "         format please see the general output data format section\n");

src/msolve/msolve-data.h

@@ -21,7 +21,6 @@
 #ifndef MSOLVE_DATA_H
 #define MSOLVE_DATA_H
 
-#define _GNU_SOURCE
 #include "../neogb/data.h"
 #include<flint/fmpz.h>
 #include<flint/fmpq.h>
@@ -36,6 +35,10 @@
 	(a) % (b)
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct
 {
   mpz_t numer;
@@ -360,4 +363,8 @@ typedef struct{
   files_gb *files;
 } msolveflags_struct;
 typedef msolveflags_struct msflags_t[1];
+#ifdef __cplusplus
+}
+#endif
+
 #endif

src/msolve/msolve.c

@@ -95,7 +95,7 @@ static inline void mpz_upoly_out_str(FILE *file, mpz_upoly_t pol) {
   fprintf(file, "]");
 }
 
-static inline void mpz_param_init(mpz_param_t param) {
+void mpz_param_init(mpz_param_t param) {
   param->nvars = 0;
   param->nsols = 0;
   mpz_upoly_init(param->elim, 0);
@@ -104,7 +104,7 @@ static inline void mpz_param_init(mpz_param_t param) {
   param->cfs = NULL;
 }
 
-static inline void mpz_param_clear(mpz_param_t param) {
+void mpz_param_clear(mpz_param_t param) {
   mpz_upoly_clear(param->elim);
   mpz_upoly_clear(param->denom);
   if (param->coords != NULL) {
@@ -292,7 +292,7 @@ static inline void display_fglm_mpq_matrix(FILE *file, mpq_matfglm_t mat) {
   fprintf(file, "\n");
 }
 
-static inline data_gens_ff_t *allocate_data_gens() {
+data_gens_ff_t *allocate_data_gens() {
   data_gens_ff_t *gens = (data_gens_ff_t *)(malloc(sizeof(data_gens_ff_t)));
   gens->lens = NULL;
   gens->exps = NULL;
@@ -304,7 +304,7 @@ static inline data_gens_ff_t *allocate_data_gens() {
   return gens;
 }
 
-static inline void free_data_gens(data_gens_ff_t *gens) {
+void free_data_gens(data_gens_ff_t *gens) {
   for (long i = 0; i < gens->nvars; i++) {
     free(gens->vnames[i]);
   }
@@ -5012,8 +5012,8 @@ void msolve_julia(
     /* gens->vnames                = var_names; */
     gens->vnames  = (char **)malloc((unsigned long)nr_vars * sizeof(char *));
     for (i = 0; i < nr_vars; ++i) {
-        gens->vnames[i] = calloc((unsigned long)strlen(var_names[i]), sizeof(char));
-        memcpy(gens->vnames[i], var_names[i], (unsigned long)strlen(var_names[i]) * sizeof(char));
+        gens->vnames[i] = calloc(strlen(var_names[i]) + 1, sizeof(char));
+        memcpy(gens->vnames[i], var_names[i], (strlen(var_names[i]) + 1) * sizeof(char));
     }
     /* gens->lens                  = lens; */
     gens->lens  = (int32_t *)malloc((unsigned long)nr_gens * sizeof(int32_t));

src/msolve/msolve.h

@@ -23,6 +23,10 @@
 
 #include "msolve-data.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int msolve_trace_qq(
         mpz_param_t *mpz_paramp,
         param_t **nmod_param,
@@ -218,4 +222,16 @@ int64_t export_groebner_qq(
         const int32_t truncate_lifting,
         const int32_t info_level 
         );
+
+// Utility functions to init and deinit data structures
+void real_point_clear(real_point_t pt);
+void mpz_param_init(mpz_param_t param);
+void mpz_param_clear(mpz_param_t param);
+data_gens_ff_t* allocate_data_gens();
+void free_data_gens(data_gens_ff_t* gens);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif

src/neogb/data.h

@@ -22,7 +22,6 @@
 #ifndef GB_DATA_H
 #define GB_DATA_H
 
-#define _GNU_SOURCE
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdio.h>