Commit ef1bd9ab authored by jan.koester's avatar jan.koester
Browse files

win32

parent ca69ac60

plugin/dns/dns.cpp

+3 −0
Changes for plugin/dns/dns.cpp: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ 
#include "rpc/services.h"

#include "dsdb/dn.h"



/* winerror.h defines this as a macro */

#undef NOERROR



namespace fenrirds {



namespace dnsz = dsdb::dns;

src/CMakeLists.txt

+2 −0
Changes for src/CMakeLists.txt: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ set_target_properties(fenrirds-core PROPERTIES 
    WINDOWS_EXPORT_ALL_SYMBOLS ON

)



target_compile_definitions(fenrirds-core INTERFACE FENRIRDS_CORE_IMPORT)



add_executable(fenrirds

    admin.cpp

    dirapi.cpp

src/cluster.h

+1 −1
Changes for src/cluster.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -341,5 +341,5 @@ namespace fenrirds { 
    };



    // Global cluster instance

    extern Cluster *g_Cluster;

    extern CORE_DATA Cluster *g_Cluster;

};

src/fenrirds.h

+9 −2
Changes for src/fenrirds.h: 9 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -42,13 +42,20 @@ 


#define VERSION 1



/* variables of fenrirds-core need dllimport in the modules linking the DLL */

#if defined(_WIN32) && defined(FENRIRDS_CORE_IMPORT)

#define CORE_DATA __declspec(dllimport)

#else

#define CORE_DATA

#endif



namespace fenrirds {

    class Client;

    class Session;



    extern class Client   AuthClient;

    extern std::mutex     AuthClientLock;

    extern Session        *AuthSession;

    extern CORE_DATA Session        *AuthSession;



    struct AuthHeader{

        int    start = 0xFE;
@@ -161,7 +168,7 @@ namespace fenrirds { 


    // Set on replication slaves: rewrites the storage of a domain resolved

    // from the (replicated) admin db to this node's own storage.

    extern std::function<void(const uuid::uuid &did, DomainInfo &info)> g_DomainStorageOverride;

    extern CORE_DATA std::function<void(const uuid::uuid &did, DomainInfo &info)> g_DomainStorageOverride;



    class DomainBackend {

    public:

src/plugin.h

+9 −2
Changes for src/plugin.h: 9 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -39,6 +39,13 @@ 
#include "dsdb/object.h"

#include "dsdb/attrs.h"



/* variables of fenrirds-core need dllimport in the modules linking the DLL */

#if defined(_WIN32) && defined(FENRIRDS_CORE_IMPORT)

#define CORE_DATA __declspec(dllimport)

#else

#define CORE_DATA

#endif



namespace fenrirds { namespace dsdb { class Directory; } }



#ifdef Windows
@@ -374,8 +381,8 @@ namespace fenrirds { 
    /* Global pointers set by main after loading plugins.

     * Other translation units (admin.cpp, api.cpp) use these

     * without linking to the plugin at build time.            */

    extern KdcPlugin      *g_KdcPlugin;

    extern AdPlugin       *g_AdPlugin;

    extern CORE_DATA KdcPlugin      *g_KdcPlugin;

    extern CORE_DATA AdPlugin       *g_AdPlugin;

    extern PluginManager  *g_PluginManager;



};