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.

Sign up for GitHub

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

Jump to bottom

Fix oboe driver build issue in latest glib #1063

Closed
wants to merge 1 commit into from
Closed

Fix oboe driver build issue in latest glib #1063

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 7 additions & 1 deletion src/drivers/fluid_adriver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@

#include "fluidsynth_priv.h"

#ifdef __cplusplus
extern "C" {
#endif

/*
* fluid_audio_driver_t
*/
Expand Down Expand Up @@ -175,6 +179,8 @@ fluid_audio_driver_t *new_fluid_file_audio_driver(fluid_settings_t *settings,
void delete_fluid_file_audio_driver(fluid_audio_driver_t *p);
#endif


#ifdef __cplusplus
}
#endif

#endif /* _FLUID_AUDRIVER_H */
4 changes: 0 additions & 4 deletions src/drivers/fluid_oboe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,9 @@
* This file may make use of C++14, because it's required by oboe anyway.
*/

extern "C" {

#include "fluid_adriver.h"
#include "fluid_settings.h"

} // extern "C"

#if OBOE_SUPPORT

#include <oboe/Oboe.h>
Expand Down
8 changes: 8 additions & 0 deletions src/utils/fluid_settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
#ifndef _FLUID_SETTINGS_H
#define _FLUID_SETTINGS_H

#ifdef __cplusplus
extern "C" {
#endif

int fluid_settings_add_option(fluid_settings_t *settings, const char *name, const char *s);
int fluid_settings_remove_option(fluid_settings_t *settings, const char *name, const char *s);

Expand Down Expand Up @@ -54,4 +58,8 @@ int fluid_settings_split_csv(const char *str, int *buf, int buf_len);

void* fluid_settings_get_user_data(fluid_settings_t * settings, const char *name);

#ifdef __cplusplus
}
#endif

#endif /* _FLUID_SETTINGS_H */
6 changes: 6 additions & 0 deletions src/utils/fluidsynth_priv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@

#include "fluidsynth.h"

#ifdef __cplusplus
extern "C" {
#endif

/***************************************************************
*
Expand Down Expand Up @@ -318,5 +321,8 @@ else \
#define fluid_return_val_if_fail(cond, val) \
fluid_return_if_fail(cond) (val)

#ifdef __cplusplus
}
#endif

#endif /* _FLUIDSYNTH_PRIV_H */