Skip to content

[WIP] Refactor and fix C++ interface outside x86 #474

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

Open
qyot27 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[WIP] Refactor and fix C++ interface outside x86 #474

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cac876c
avisynth.h: force C-style linkage outside of Windows/x86
qyot27 Jan 14, 2026
535cca0
avisynth.h: clean up scattered #includes
qyot27 Feb 3, 2026
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
22 changes: 15 additions & 7 deletions avs_core/include/avisynth.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@

#include "avs/config.h"
#include "avs/capi.h"
#include "avs/cpuid.h"
#include "avs/types.h"

#ifdef AVS_POSIX
Expand Down Expand Up @@ -165,7 +166,17 @@ enum AvsVersion {
#define _ASSERT(x) assert(x)
#endif

#if defined(BUILDING_AVSCORE) || defined(AVS_STATIC_LIB)
# ifndef offsetof
# include <stddef.h>
# endif
#endif

// Use C-style linkage on Windows if targetting any CPU architecture
// other than legacy x86
#if defined(AVS_WINDOWS) && !defined(AVS_WINDOWS_X86)
extern "C" {
#endif

// I had problems with Premiere wanting 1-byte alignment for its structures,
// so I now set the Avisynth struct alignment explicitly here.
Expand Down Expand Up @@ -510,10 +521,6 @@ extern __declspec(dllimport) const AVS_Linkage* const AVS_linkage;
extern const AVS_Linkage* AVS_linkage;
# endif

# ifndef offsetof
# include <stddef.h>
# endif

# define AVS_BakedCode(arg) { arg ; }
# define AVS_LinkCall(arg) !AVS_linkage || offsetof(AVS_Linkage, arg) >= (size_t)AVS_linkage->Size ? 0 : (this->*(AVS_linkage->arg))
# define AVS_LinkCall_Void(arg) !AVS_linkage || offsetof(AVS_Linkage, arg) >= (size_t)AVS_linkage->Size ? (void)0 : (this->*(AVS_linkage->arg))
Expand Down Expand Up @@ -1525,8 +1532,6 @@ class PFunction
#undef AVS_BakedCode


#include "avs/cpuid.h"

// IScriptEnvironment GetEnvProperty
enum AvsEnvProperty {
AEP_PHYSICAL_CPUS = 1,
Expand Down Expand Up @@ -2045,7 +2050,6 @@ AVSC_API(IScriptEnvironment*, CreateScriptEnvironment)(int version = AVISYNTH_IN
#define VARNAME_Enable_PlanarToPackedRGB "OPT_Enable_PlanarToPackedRGB" // AVS+ convert Planar RGB to packed RGB (VfW)

// C exports
#include "avs/capi.h"
AVSC_API(IScriptEnvironment2*, CreateScriptEnvironment2)(int version = AVISYNTH_INTERFACE_VERSION);

#ifndef BUILDING_AVSCORE
Expand All @@ -2054,4 +2058,8 @@ AVSC_API(IScriptEnvironment2*, CreateScriptEnvironment2)(int version = AVISYNTH_

#pragma pack(pop)

#if defined(AVS_WINDOWS) && !defined(AVS_WINDOWS_X86)
}
#endif // extern "C"

#endif //__AVISYNTH_12_H__