Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only include headers before extern "C" #2090

Merged
merged 1 commit into from
Oct 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/fexpr.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
#define FEXPR_INLINE static inline
#endif

#ifdef __cplusplus
extern "C" {
#endif

#include "mpoly_types.h"
#include "arf_types.h"
#include "gr_types.h"

#ifdef __cplusplus
extern "C" {
#endif

/* FIXME: We need calcium_stream in ca_types.h, but this header includes qqbar.h
which conditionally defines functions using fexpr_t if and only if FEXPR_H is
defined. And at this point FEXPR_H is defined, but not fexpr_t... */
Expand Down
4 changes: 2 additions & 2 deletions src/fexpr_builtin.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
#define FEXPR_BUILTIN_INLINE static inline
#endif

#include "fexpr.h"

#ifdef __cplusplus
extern "C" {
#endif

#include "fexpr.h"

/* Builtin symbols */

/* Must be listed in alphabetical order with corresponding entry
Expand Down
8 changes: 4 additions & 4 deletions src/fmpz_mpoly_q.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
#define FMPZ_MPOLY_Q_INLINE static inline
#endif

#ifdef __cplusplus
extern "C" {
#endif

#include "fmpz.h"
#include "fmpz_vec.h"
#include "fmpz_mpoly.h"
#include "acb_types.h"

#ifdef __cplusplus
extern "C" {
#endif

#define fmpz_mpoly_q_numref(x) (&((x)->num))
#define fmpz_mpoly_q_denref(x) (&((x)->den))

Expand Down
8 changes: 4 additions & 4 deletions src/qqbar.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
#define QQBAR_INLINE static inline
#endif

#ifdef __cplusplus
extern "C" {
#endif

#include "fmpz_types.h"
#include "fmpq_types.h"
#include "mpoly_types.h"
#include "acb.h"

#ifdef __cplusplus
extern "C" {
#endif

typedef struct
{
fmpz_poly_struct poly;
Expand Down
Loading