Skip to content

Commit

Permalink
Fix unix build errors introduced with the previous commit.
Browse files Browse the repository at this point in the history
  • Loading branch information
c-lipka committed Sep 7, 2016
1 parent e50d5b4 commit 6b6b1b3
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 4 deletions.
20 changes: 20 additions & 0 deletions source/backend/configbackend.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,26 @@
#define COMPILER_VER ".u"
#endif

/// @def POV_USE_DEFAULT_TASK_INITIALIZE
/// Whether to use a default implementation for task thread initialization.
///
/// Define as non-zero to use a default implementation for the @ref Task::Initialize() method, or zero if the
/// platform provides its own implementation.
///
#ifndef POV_USE_DEFAULT_TASK_INITIALIZE
#define POV_USE_DEFAULT_TASK_INITIALIZE 1
#endif

/// @def POV_USE_DEFAULT_TASK_CLEANUP
/// Whether to use a default implementation for task thread cleanup.
///
/// Define as non-zero to use a default implementation for the @ref Task::Cleanup() method, or zero if the
/// platform provides its own implementation.
///
#ifndef POV_USE_DEFAULT_TASK_CLEANUP
#define POV_USE_DEFAULT_TASK_CLEANUP 1
#endif


/*
* Font related macros [trf]
Expand Down
1 change: 1 addition & 0 deletions source/base/fileinputoutput.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
#include "base/configbase.h"

// C++ variants of standard C header files
#include <cstdio>
#include <cstring>

// POV-Ray base header files
Expand Down
2 changes: 2 additions & 0 deletions source/base/messenger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
// Unit header file must be the first file included within POV-Ray *.cpp files (pulls in config)
#include "base/messenger.h"

// C++ variants of standard C header files
#include <cstdio>
#include <cstring>

#include "base/pov_err.h"
Expand Down
1 change: 1 addition & 0 deletions source/base/pov_err.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include "base/pov_err.h"

// C++ variants of standard C header files
#include <cstdio>
#include <cstring>

// this must be the last file included
Expand Down
2 changes: 1 addition & 1 deletion source/base/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#define OFFICIAL_VERSION_STRING "3.7.1"
#define OFFICIAL_VERSION_NUMBER 371

#define POV_RAY_PRERELEASE "alpha.8776277"
#define POV_RAY_PRERELEASE "alpha.8776366"

#if (POV_RAY_IS_AUTOBUILD == 1) && ((POV_RAY_IS_OFFICIAL == 1) || (POV_RAY_IS_SEMI_OFFICIAL == 1))
#ifdef POV_RAY_PRERELEASE
Expand Down
1 change: 1 addition & 0 deletions source/frontend/renderfrontend.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
#include "povms/povmsid.h"

#include "base/path.h"
#include "base/platformbase.h"
#include "base/stringutilities.h"
#include "base/textstreambuffer.h"
#include "base/types.h"
Expand Down
2 changes: 1 addition & 1 deletion unix/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.7.1-alpha.8776277
3.7.1-alpha.8776366
3 changes: 2 additions & 1 deletion unix/povconfig/syspovconfigbackend.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
#define SYS_DEF_EXT ""

// On Unix platforms, we don't do anything special at thread startup.
#define POV_USE_DEFAULT_THREAD_INITIALIZATION 1
#define POV_USE_DEFAULT_TASK_INITIALIZE 1
#define POV_USE_DEFAULT_TASK_CLEANUP 1

#endif // POVRAY_UNIX_SYSPOVCONFIGBACKEND_H
3 changes: 2 additions & 1 deletion windows/povconfig/syspovconfigbackend.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
#include "syspovconfig.h"

// On the Windows platform, we're doing some special mojo at thread startup.
#define POV_USE_DEFAULT_THREAD_INITIALIZATION 0
#define POV_USE_DEFAULT_TASK_INITIALIZE 0
#define POV_USE_DEFAULT_TASK_CLEANUP 0

#endif // POVRAY_WINDOWS_SYSPOVCONFIGBACKEND_H

0 comments on commit 6b6b1b3

Please sign in to comment.