Skip to content

Commit 6b6b1b3

Browse files
committed
Fix unix build errors introduced with the previous commit.
1 parent e50d5b4 commit 6b6b1b3

File tree

9 files changed

+31
-4
lines changed

9 files changed

+31
-4
lines changed

source/backend/configbackend.h

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,26 @@
9595
#define COMPILER_VER ".u"
9696
#endif
9797

98+
/// @def POV_USE_DEFAULT_TASK_INITIALIZE
99+
/// Whether to use a default implementation for task thread initialization.
100+
///
101+
/// Define as non-zero to use a default implementation for the @ref Task::Initialize() method, or zero if the
102+
/// platform provides its own implementation.
103+
///
104+
#ifndef POV_USE_DEFAULT_TASK_INITIALIZE
105+
#define POV_USE_DEFAULT_TASK_INITIALIZE 1
106+
#endif
107+
108+
/// @def POV_USE_DEFAULT_TASK_CLEANUP
109+
/// Whether to use a default implementation for task thread cleanup.
110+
///
111+
/// Define as non-zero to use a default implementation for the @ref Task::Cleanup() method, or zero if the
112+
/// platform provides its own implementation.
113+
///
114+
#ifndef POV_USE_DEFAULT_TASK_CLEANUP
115+
#define POV_USE_DEFAULT_TASK_CLEANUP 1
116+
#endif
117+
98118

99119
/*
100120
* Font related macros [trf]

source/base/fileinputoutput.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
#include "base/configbase.h"
4141

4242
// C++ variants of standard C header files
43+
#include <cstdio>
4344
#include <cstring>
4445

4546
// POV-Ray base header files

source/base/messenger.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
// Unit header file must be the first file included within POV-Ray *.cpp files (pulls in config)
3737
#include "base/messenger.h"
3838

39+
// C++ variants of standard C header files
40+
#include <cstdio>
3941
#include <cstring>
4042

4143
#include "base/pov_err.h"

source/base/pov_err.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include "base/pov_err.h"
3838

3939
// C++ variants of standard C header files
40+
#include <cstdio>
4041
#include <cstring>
4142

4243
// this must be the last file included

source/base/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
#define OFFICIAL_VERSION_STRING "3.7.1"
4646
#define OFFICIAL_VERSION_NUMBER 371
4747

48-
#define POV_RAY_PRERELEASE "alpha.8776277"
48+
#define POV_RAY_PRERELEASE "alpha.8776366"
4949

5050
#if (POV_RAY_IS_AUTOBUILD == 1) && ((POV_RAY_IS_OFFICIAL == 1) || (POV_RAY_IS_SEMI_OFFICIAL == 1))
5151
#ifdef POV_RAY_PRERELEASE

source/frontend/renderfrontend.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
#include "povms/povmsid.h"
5151

5252
#include "base/path.h"
53+
#include "base/platformbase.h"
5354
#include "base/stringutilities.h"
5455
#include "base/textstreambuffer.h"
5556
#include "base/types.h"

unix/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.7.1-alpha.8776277
1+
3.7.1-alpha.8776366

unix/povconfig/syspovconfigbackend.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
#define SYS_DEF_EXT ""
4848

4949
// On Unix platforms, we don't do anything special at thread startup.
50-
#define POV_USE_DEFAULT_THREAD_INITIALIZATION 1
50+
#define POV_USE_DEFAULT_TASK_INITIALIZE 1
51+
#define POV_USE_DEFAULT_TASK_CLEANUP 1
5152

5253
#endif // POVRAY_UNIX_SYSPOVCONFIGBACKEND_H

windows/povconfig/syspovconfigbackend.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
#include "syspovconfig.h"
4343

4444
// On the Windows platform, we're doing some special mojo at thread startup.
45-
#define POV_USE_DEFAULT_THREAD_INITIALIZATION 0
45+
#define POV_USE_DEFAULT_TASK_INITIALIZE 0
46+
#define POV_USE_DEFAULT_TASK_CLEANUP 0
4647

4748
#endif // POVRAY_WINDOWS_SYSPOVCONFIGBACKEND_H

0 commit comments

Comments
 (0)