Menu
▾
▴
[PVMPOV-CVS] pvmpov_3_5/src optin.cpp,1.3,1.4 optin.h,1.2,1.3 optout.cpp,1.2,1.3 optout.h,1.3,1.4 povmsgid.h,1.2,1.3 povmsrec.cpp,1.4,1.5 povray.cpp,1.2,1.3 render.cpp,1.2,1.3 userio.cpp,1.2,1.3
Update of /cvsroot/pvmpov/pvmpov_3_5/src
In directory usw-pr-cvs1:/tmp/cvs-serv29721
Modified Files:
optin.cpp optin.h optout.cpp optout.h povmsgid.h povmsrec.cpp
povray.cpp render.cpp userio.cpp
Log Message:
Lee Begg 3 Nov 2002
Changed #ifdef PVM to #ifdef HAVE_LIBPVM3
Saves having to manually define it.
Note to self: Have not finished patching userio.cpp yet (also povray.cpp)
Index: optin.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/optin.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** optin.cpp 30 Oct 2002 01:05:06 -0000 1.3
--- optin.cpp 3 Nov 2002 07:39:35 -0000 1.4
***************
*** 26,35 ****
* $Author$
* $Log$
! * Revision 1.3 2002/10/30 01:05:06 llnz
! * Lee Begg 30 Oct 2002
! * - optin.cpp: fixed what sets PVM going and +ni handling
! * - povmsrec.cpp: added Working Directory handler, now uses PVM_WD +nd
! * - pvm.cpp: change -ni<workingdir> to +ni<workingdir> to work with new
! * options system
*
* Revision 1.1.1.1 2002/10/05 10:21:45 flierl
--- 26,36 ----
* $Author$
* $Log$
! * Revision 1.4 2002/11/03 07:39:35 llnz
! * Lee Begg 3 Nov 2002
! *
! * Changed #ifdef PVM to #ifdef HAVE_LIBPVM3
! * Saves having to manually define it.
! *
! * Note to self: Have not finished patching userio.cpp yet (also povray.cpp)
*
* Revision 1.1.1.1 2002/10/05 10:21:45 flierl
***************
*** 209,213 ****
{ "Output_To_File", kPOVAttrib_OutputToFile, kPOVMSType_Bool },
! #ifdef PVM
{ "PVM", kPOVAttrib_PVMUse, kPOVMSType_Bool },
{ "PVM_Arch", kPOVAttrib_PVMArch, kPOVMSType_CString },
--- 210,214 ----
{ "Output_To_File", kPOVAttrib_OutputToFile, kPOVMSType_Bool },
! #ifdef HAVE_LIBPVM3
{ "PVM", kPOVAttrib_PVMUse, kPOVMSType_Bool },
{ "PVM_Arch", kPOVAttrib_PVMArch, kPOVMSType_CString },
***************
*** 337,341 ****
{ "MB", kNoParameter, kNoParameter, kPOVAttrib_Bounding },
{ "MV", kPOVAttrib_Version, kPOVMSType_Float, kNoParameter },
! #ifdef PVM
{ "NA", kPOVAttrib_PVMArch, kPOVMSType_CString, kPOVAttrib_PVMUse },
{ "ND", kPOVAttrib_PVMWD, kPOVObjectClass_File, kNoParameter },
--- 338,342 ----
{ "MB", kNoParameter, kNoParameter, kPOVAttrib_Bounding },
{ "MV", kPOVAttrib_Version, kPOVMSType_Float, kNoParameter },
! #ifdef HAVE_LIBPVM3
{ "NA", kPOVAttrib_PVMArch, kPOVMSType_CString, kPOVAttrib_PVMUse },
{ "ND", kPOVAttrib_PVMWD, kPOVObjectClass_File, kNoParameter },
Index: optin.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/optin.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** optin.h 28 Oct 2002 01:45:43 -0000 1.2
--- optin.h 3 Nov 2002 07:39:35 -0000 1.3
***************
*** 26,38 ****
* $Author$
* $Log$
! * Revision 1.2 2002/10/28 01:45:43 llnz
! * Applied 3.1 patch as best as I could.
! * New code written by Lee Begg, mostly around the new options system in
! * povray 3.5
*
! * Fixed misleading comment in pvm.cpp
*
! * Has NOT been tested with PVM yet.
! * #define PVM must be added to conf.h to test patch.
*
* Revision 1.1.1.1 2002/10/05 10:23:52 flierl
--- 26,36 ----
* $Author$
* $Log$
! * Revision 1.3 2002/11/03 07:39:35 llnz
! * Lee Begg 3 Nov 2002
*
! * Changed #ifdef PVM to #ifdef HAVE_LIBPVM3
! * Saves having to manually define it.
*
! * Note to self: Have not finished patching userio.cpp yet (also povray.cpp)
*
* Revision 1.1.1.1 2002/10/05 10:23:52 flierl
***************
*** 157,161 ****
INCLUDE_INI_OP,
! #ifdef PVM
/* options for PVMPOV */
PVM_TASKS_OP,
--- 155,159 ----
INCLUDE_INI_OP,
! #ifdef HAVE_LIBPVM3
/* options for PVMPOV */
PVM_TASKS_OP,
Index: optout.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/optout.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** optout.cpp 28 Oct 2002 01:45:43 -0000 1.2
--- optout.cpp 3 Nov 2002 07:39:35 -0000 1.3
***************
*** 26,38 ****
* $Author$
* $Log$
! * Revision 1.2 2002/10/28 01:45:43 llnz
! * Applied 3.1 patch as best as I could.
! * New code written by Lee Begg, mostly around the new options system in
! * povray 3.5
*
! * Fixed misleading comment in pvm.cpp
*
! * Has NOT been tested with PVM yet.
! * #define PVM must be added to conf.h to test patch.
*
* Revision 1.1.1.1 2002/10/05 10:21:47 flierl
--- 26,36 ----
* $Author$
* $Log$
! * Revision 1.3 2002/11/03 07:39:35 llnz
! * Lee Begg 3 Nov 2002
*
! * Changed #ifdef PVM to #ifdef HAVE_LIBPVM3
! * Saves having to manually define it.
*
! * Note to self: Have not finished patching userio.cpp yet (also povray.cpp)
*
* Revision 1.1.1.1 2002/10/05 10:21:47 flierl
***************
*** 93,97 ****
#include "povmsgid.h"
#include "isosurf.h"
! #ifdef PVM
#include "pvm.h" /* PVMPOV */
#endif
--- 91,95 ----
#include "povmsgid.h"
#include "isosurf.h"
! #ifdef HAVE_LIBPVM3
#include "pvm.h" /* PVMPOV */
#endif
***************
*** 505,509 ****
Banner(" 5 Tracing Options\n");
Banner(" 6 Animation Options\n");
! #ifdef PVM
Banner(" 7 PVM Options\n");
Banner(" 8 Redirecting Options\n");
--- 503,507 ----
Banner(" 5 Tracing Options\n");
Banner(" 6 Animation Options\n");
! #ifdef HAVE_LIBPVM3
Banner(" 7 PVM Options\n");
Banner(" 8 Redirecting Options\n");
***************
*** 638,642 ****
break;
! #ifdef PVM
/* PVM Options */
--- 636,640 ----
break;
! #ifdef HAVE_LIBPVM3
/* PVM Options */
***************
*** 1057,1061 ****
Render_Info("\n");
! #ifdef PVM
/* print options for PVMPOV */
--- 1055,1059 ----
Render_Info("\n");
! #ifdef HAVE_LIBPVM3
/* print options for PVMPOV */
Index: optout.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/optout.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** optout.h 28 Oct 2002 01:45:43 -0000 1.3
--- optout.h 3 Nov 2002 07:39:35 -0000 1.4
***************
*** 26,38 ****
* $Author$
* $Log$
! * Revision 1.3 2002/10/28 01:45:43 llnz
! * Applied 3.1 patch as best as I could.
! * New code written by Lee Begg, mostly around the new options system in
! * povray 3.5
*
! * Fixed misleading comment in pvm.cpp
*
! * Has NOT been tested with PVM yet.
! * #define PVM must be added to conf.h to test patch.
*
* Revision 1.2 2002/10/05 15:09:44 flierl
--- 26,36 ----
* $Author$
* $Log$
! * Revision 1.4 2002/11/03 07:39:35 llnz
! * Lee Begg 3 Nov 2002
*
! * Changed #ifdef PVM to #ifdef HAVE_LIBPVM3
! * Saves having to manually define it.
*
! * Note to self: Have not finished patching userio.cpp yet (also povray.cpp)
*
* Revision 1.2 2002/10/05 15:09:44 flierl
***************
*** 72,76 ****
/* Number of help pages (numbered 0 to MAX_HELP_PAGE). */
! #ifdef PVM
#define MAX_HELP_PAGE 8
#else
--- 70,74 ----
/* Number of help pages (numbered 0 to MAX_HELP_PAGE). */
! #ifdef HAVE_LIBPVM3
#define MAX_HELP_PAGE 8
#else
Index: povmsgid.h
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/povmsgid.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** povmsgid.h 28 Oct 2002 01:45:43 -0000 1.2
--- povmsgid.h 3 Nov 2002 07:39:35 -0000 1.3
***************
*** 26,38 ****
* $Author$
* $Log$
! * Revision 1.2 2002/10/28 01:45:43 llnz
! * Applied 3.1 patch as best as I could.
! * New code written by Lee Begg, mostly around the new options system in
! * povray 3.5
*
! * Fixed misleading comment in pvm.cpp
*
! * Has NOT been tested with PVM yet.
! * #define PVM must be added to conf.h to test patch.
*
* Revision 1.1.1.1 2002/10/05 10:23:56 flierl
--- 26,36 ----
* $Author$
* $Log$
! * Revision 1.3 2002/11/03 07:39:35 llnz
! * Lee Begg 3 Nov 2002
*
! * Changed #ifdef PVM to #ifdef HAVE_LIBPVM3
! * Saves having to manually define it.
*
! * Note to self: Have not finished patching userio.cpp yet (also povray.cpp)
*
* Revision 1.1.1.1 2002/10/05 10:23:56 flierl
***************
*** 262,266 ****
kPOVAttrib_EndColumn = kPOVAttrib_Right,
kPOVAttrib_StartRow = kPOVAttrib_Top,
! #ifdef PVM
kPOVAttrib_EndRow = kPOVAttrib_Bottom,
kPOVAttrib_PVMTasks = 'PVMt',
--- 260,264 ----
kPOVAttrib_EndColumn = kPOVAttrib_Right,
kPOVAttrib_StartRow = kPOVAttrib_Top,
! #ifdef HAVE_LIBPVM3
kPOVAttrib_EndRow = kPOVAttrib_Bottom,
kPOVAttrib_PVMTasks = 'PVMt',
Index: povmsrec.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/povmsrec.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** povmsrec.cpp 30 Oct 2002 01:12:47 -0000 1.4
--- povmsrec.cpp 3 Nov 2002 07:39:35 -0000 1.5
***************
*** 26,32 ****
* $Author$
* $Log$
! * Revision 1.4 2002/10/30 01:12:47 llnz
! * Lee Begg 30 Oct 2002
! * removed debugging stuff from povmsrec.cpp
*
* Revision 1.1.1.1 2002/10/05 10:22:38 flierl
--- 26,36 ----
* $Author$
* $Log$
! * Revision 1.5 2002/11/03 07:39:35 llnz
! * Lee Begg 3 Nov 2002
! *
! * Changed #ifdef PVM to #ifdef HAVE_LIBPVM3
! * Saves having to manually define it.
! *
! * Note to self: Have not finished patching userio.cpp yet (also povray.cpp)
*
* Revision 1.1.1.1 2002/10/05 10:22:38 flierl
***************
*** 67,71 ****
#include "povmsend.h"
#include "pov_err.h"
! #ifdef PVM
#include "pvm.h"
#endif
--- 71,75 ----
#include "povmsend.h"
#include "pov_err.h"
! #ifdef HAVE_LIBPVM3
#include "pvm.h"
#endif
***************
*** 781,785 ****
(void)BuildRenderOptions(result);
! #ifdef PVM
if(POVMSUtil_GetBool(msg, kPOVAttrib_PVMUse, &b) == 0)
{
--- 785,789 ----
(void)BuildRenderOptions(result);
! #ifdef HAVE_LIBPVM3
if(POVMSUtil_GetBool(msg, kPOVAttrib_PVMUse, &b) == 0)
{
Index: povray.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/povray.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** povray.cpp 28 Oct 2002 01:45:43 -0000 1.2
--- povray.cpp 3 Nov 2002 07:39:35 -0000 1.3
***************
*** 27,39 ****
* $Author$
* $Log$
! * Revision 1.2 2002/10/28 01:45:43 llnz
! * Applied 3.1 patch as best as I could.
! * New code written by Lee Begg, mostly around the new options system in
! * povray 3.5
*
! * Fixed misleading comment in pvm.cpp
*
! * Has NOT been tested with PVM yet.
! * #define PVM must be added to conf.h to test patch.
*
* Revision 1.1.1.1 2002/10/05 10:22:42 flierl
--- 27,37 ----
* $Author$
* $Log$
! * Revision 1.3 2002/11/03 07:39:35 llnz
! * Lee Begg 3 Nov 2002
*
! * Changed #ifdef PVM to #ifdef HAVE_LIBPVM3
! * Saves having to manually define it.
*
! * Note to self: Have not finished patching userio.cpp yet (also povray.cpp)
*
* Revision 1.1.1.1 2002/10/05 10:22:42 flierl
***************
*** 107,111 ****
#include "pov_err.h"
#include "optout.h"
! #ifdef PVM
#include "pvm.h" /* PVMPOV */
#endif
--- 105,109 ----
#include "pov_err.h"
#include "optout.h"
! #ifdef HAVE_LIBPVM3
#include "pvm.h" /* PVMPOV */
#endif
***************
*** 488,492 ****
#endif
! #ifdef PVM
/* If slave, turn off certain options */
if ( PvmSlave)
--- 486,490 ----
#endif
! #ifdef HAVE_LIBPVM3
/* If slave, turn off certain options */
if ( PvmSlave)
***************
*** 501,505 ****
Open_Text_Streams();
! #ifdef PVM
if ( !PvmSlave) {
/* Write .INI file [SCD 2/95] */
--- 499,503 ----
Open_Text_Streams();
! #ifdef HAVE_LIBPVM3
if ( !PvmSlave) {
/* Write .INI file [SCD 2/95] */
***************
*** 524,528 ****
init_output_file_handle();
! #ifdef PVM
/* Initialize PVM master */
if ( !PvmSlave && PvmTasks)
--- 522,526 ----
init_output_file_handle();
! #ifdef HAVE_LIBPVM3
/* Initialize PVM master */
if ( !PvmSlave && PvmTasks)
***************
*** 792,796 ****
Clock_Delta = ((Diff_Frame == 0) ? 0 : Diff_Clock/Diff_Frame);
! #ifdef PVM
/* PVM Slave */
if (PvmSlave ) {
--- 790,794 ----
Clock_Delta = ((Diff_Frame == 0) ? 0 : Diff_Clock/Diff_Frame);
! #ifdef HAVE_LIBPVM3
/* PVM Slave */
if (PvmSlave ) {
***************
*** 828,832 ****
{
! #ifdef PVM
if(!PvmSlave && PvmTasks) {
START_TIME
--- 826,830 ----
{
! #ifdef HAVE_LIBPVM3
if(!PvmSlave && PvmTasks) {
START_TIME
***************
*** 879,883 ****
}
! #ifdef PVM
}
#endif
--- 877,881 ----
}
! #ifdef HAVE_LIBPVM3
}
#endif
***************
*** 1054,1058 ****
START_TIME
! #ifdef PVM
if( !PvmSlave) {
#endif
--- 1052,1056 ----
START_TIME
! #ifdef HAVE_LIBPVM3
if( !PvmSlave) {
#endif
***************
*** 1081,1085 ****
}
! #ifdef PVM
} /* !PvmTasks */
#endif
--- 1079,1083 ----
}
! #ifdef HAVE_LIBPVM3
} /* !PvmTasks */
#endif
***************
*** 1088,1092 ****
Initialize_Renderer();
! #ifdef PVM
/* If a PVM slave, re-assign Write_Line to PVM */
if (PvmSlave) {
--- 1086,1090 ----
Initialize_Renderer();
! #ifdef HAVE_LIBPVM3
/* If a PVM slave, re-assign Write_Line to PVM */
if (PvmSlave) {
***************
*** 1100,1104 ****
// initialize the display until we know this, which in turn means we can't
// read the rendered part before the display is initialized. [AED]
! #ifdef PVM
if (!PvmSlave) {
#endif
--- 1098,1102 ----
// initialize the display until we know this, which in turn means we can't
// read the rendered part before the display is initialized. [AED]
! #ifdef HAVE_LIBPVM3
if (!PvmSlave) {
#endif
***************
*** 1113,1121 ****
opts.Last_Column = Frame.Screen_Width;
}
! #ifdef PVM
} /* !PvmSlave */
#endif
! #ifdef PVM
if(PvmSlave || !PvmTasks) {
#endif
--- 1111,1119 ----
opts.Last_Column = Frame.Screen_Width;
}
! #ifdef HAVE_LIBPVM3
} /* !PvmSlave */
#endif
! #ifdef HAVE_LIBPVM3
if(PvmSlave || !PvmTasks) {
#endif
***************
*** 1124,1128 ****
tparse += TIME_ELAPSED
! #ifdef PVM
} /* PvmSlave || !PvmTasks */
#endif
--- 1122,1126 ----
tparse += TIME_ELAPSED
! #ifdef HAVE_LIBPVM3
} /* PvmSlave || !PvmTasks */
#endif
***************
*** 1157,1161 ****
Send_RenderStatus("Rendering");
! #ifdef PVM
do {
#endif
--- 1155,1159 ----
Send_RenderStatus("Rendering");
! #ifdef HAVE_LIBPVM3
do {
#endif
***************
*** 1188,1192 ****
}
! #ifdef PVM
} while(PvmSlave ? Pvm_Slave_Control() : 0); /* ask for more work */
#endif
--- 1186,1190 ----
}
! #ifdef HAVE_LIBPVM3
} while(PvmSlave ? Pvm_Slave_Control() : 0); /* ask for more work */
#endif
***************
*** 1205,1209 ****
trender = 0;
! #ifdef PVM
if(!PvmSlave) {
#endif
--- 1203,1207 ----
trender = 0;
! #ifdef HAVE_LIBPVM3
if(!PvmSlave) {
#endif
***************
*** 1214,1218 ****
Output_File = NULL;
}
! #ifdef PVM
}
#endif
--- 1212,1216 ----
Output_File = NULL;
}
! #ifdef HAVE_LIBPVM3
}
#endif
***************
*** 1249,1253 ****
POV_POST_SHUTDOWN
! #ifdef PVM
if(!PvmSlave) {
#endif
--- 1247,1251 ----
POV_POST_SHUTDOWN
! #ifdef HAVE_LIBPVM3
if(!PvmSlave) {
#endif
***************
*** 1263,1267 ****
if(opts.histogram_on)
write_histogram(opts.Histogram_File_Name);
! #ifdef PVM
}
#endif
--- 1261,1265 ----
if(opts.histogram_on)
write_histogram(opts.Histogram_File_Name);
! #ifdef HAVE_LIBPVM3
}
#endif
***************
*** 1272,1276 ****
// Print stats ...
! #ifdef PVM
if(!PvmSlave)
#endif
--- 1270,1274 ----
// Print stats ...
! #ifdef HAVE_LIBPVM3
if(!PvmSlave)
#endif
***************
*** 1815,1819 ****
opts.Radiosity_Recursion_Limit = 3;
opts.Radiosity_Quality = 6; /* Q-flag value for light gathering */
! #ifdef PVM
opts.Radiosity_File_ReadOnContinue = PvmSlave ? 0 : 1;
opts.Radiosity_File_SaveWhileRendering = PvmSlave ? 0 : 1; /* Don't save radiosity cache with PVM */
--- 1813,1817 ----
opts.Radiosity_Recursion_Limit = 3;
opts.Radiosity_Quality = 6; /* Q-flag value for light gathering */
! #ifdef HAVE_LIBPVM3
opts.Radiosity_File_ReadOnContinue = PvmSlave ? 0 : 1;
opts.Radiosity_File_SaveWhileRendering = PvmSlave ? 0 : 1; /* Don't save radiosity cache with PVM */
***************
*** 1823,1827 ****
#endif
opts.Radiosity_File_AlwaysReadAtStart = 0;
! #ifdef PVM
opts.Radiosity_File_KeepOnAbort = PvmSlave ? 0 : 1;
#else
--- 1821,1825 ----
#endif
opts.Radiosity_File_AlwaysReadAtStart = 0;
! #ifdef HAVE_LIBPVM3
opts.Radiosity_File_KeepOnAbort = PvmSlave ? 0 : 1;
#else
Index: render.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/render.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** render.cpp 28 Oct 2002 01:45:43 -0000 1.2
--- render.cpp 3 Nov 2002 07:39:35 -0000 1.3
***************
*** 30,42 ****
* $Author$
* $Log$
! * Revision 1.2 2002/10/28 01:45:43 llnz
! * Applied 3.1 patch as best as I could.
! * New code written by Lee Begg, mostly around the new options system in
! * povray 3.5
*
! * Fixed misleading comment in pvm.cpp
*
! * Has NOT been tested with PVM yet.
! * #define PVM must be added to conf.h to test patch.
*
* Revision 1.1.1.1 2002/10/05 10:22:56 flierl
--- 30,40 ----
* $Author$
* $Log$
! * Revision 1.3 2002/11/03 07:39:35 llnz
! * Lee Begg 3 Nov 2002
*
! * Changed #ifdef PVM to #ifdef HAVE_LIBPVM3
! * Saves having to manually define it.
*
! * Note to self: Have not finished patching userio.cpp yet (also povray.cpp)
*
* Revision 1.1.1.1 2002/10/05 10:22:56 flierl
***************
*** 88,92 ****
#include "file_pov.h"
#include "povms.h"
! #ifdef PVM
#include "pvm.h" /* PVMPOV */
#endif
--- 86,90 ----
#include "file_pov.h"
#include "povms.h"
! #ifdef HAVE_LIBPVM3
#include "pvm.h" /* PVMPOV */
#endif
***************
*** 432,436 ****
size = (Frame.Screen_Width + 1) * sizeof(COLOUR);
! #ifdef PVM
if (Previous_Line!=NULL) POV_FREE(Previous_Line);
if (Current_Line!=NULL) POV_FREE(Current_Line);
--- 430,434 ----
size = (Frame.Screen_Width + 1) * sizeof(COLOUR);
! #ifdef HAVE_LIBPVM3
if (Previous_Line!=NULL) POV_FREE(Previous_Line);
if (Current_Line!=NULL) POV_FREE(Current_Line);
***************
*** 451,455 ****
size = (Frame.Screen_Width + 1) * sizeof(char);
! #ifdef PVM
if (Previous_Line_Antialiased_Flags!=NULL) POV_FREE(Previous_Line_Antialiased_Flags);
if (Current_Line_Antialiased_Flags!=NULL) POV_FREE(Current_Line_Antialiased_Flags);
--- 449,453 ----
size = (Frame.Screen_Width + 1) * sizeof(char);
! #ifdef HAVE_LIBPVM3
if (Previous_Line_Antialiased_Flags!=NULL) POV_FREE(Previous_Line_Antialiased_Flags);
if (Current_Line_Antialiased_Flags!=NULL) POV_FREE(Current_Line_Antialiased_Flags);
***************
*** 466,470 ****
}
! #ifdef PVM
/* If PVM, this is already enough */
if(PvmTasks && !PvmSlave)
--- 464,468 ----
}
! #ifdef HAVE_LIBPVM3
/* If PVM, this is already enough */
if(PvmTasks && !PvmSlave)
Index: userio.cpp
===================================================================
RCS file: /cvsroot/pvmpov/pvmpov_3_5/src/userio.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** userio.cpp 28 Oct 2002 01:45:43 -0000 1.2
--- userio.cpp 3 Nov 2002 07:39:35 -0000 1.3
***************
*** 26,38 ****
* $Author$
* $Log$
! * Revision 1.2 2002/10/28 01:45:43 llnz
! * Applied 3.1 patch as best as I could.
! * New code written by Lee Begg, mostly around the new options system in
! * povray 3.5
*
! * Fixed misleading comment in pvm.cpp
*
! * Has NOT been tested with PVM yet.
! * #define PVM must be added to conf.h to test patch.
*
* Revision 1.1.1.1 2002/10/05 10:23:27 flierl
--- 26,36 ----
* $Author$
* $Log$
! * Revision 1.3 2002/11/03 07:39:35 llnz
! * Lee Begg 3 Nov 2002
*
! * Changed #ifdef PVM to #ifdef HAVE_LIBPVM3
! * Saves having to manually define it.
*
! * Note to self: Have not finished patching userio.cpp yet (also povray.cpp)
*
* Revision 1.1.1.1 2002/10/05 10:23:27 flierl
***************
*** 60,64 ****
#include "pov_err.h"
#include "file_pov.h"
! #ifdef PVM
#include "pvm.h"
#endif
--- 58,62 ----
#include "pov_err.h"
#include "file_pov.h"
! #ifdef HAVE_LIBPVM3
#include "pvm.h"
#endif
|
