diff -ur libproteingeometry-2.1/src-lib/ModifiedVolume.c dpg/libproteingeometry-2.1/src-lib/ModifiedVolume.c --- libproteingeometry-2.1/src-lib/ModifiedVolume.c Sun May 4 16:17:00 2003 +++ dpg/libproteingeometry-2.1/src-lib/ModifiedVolume.c Thu Feb 24 19:45:58 2005 @@ -4,10 +4,10 @@ static file_records * global_file ; /* Added by graham@molmovdb */ -void SaveAtomVertices (int i, atom_record *a, vertex *v1, vertex *v2) {} +//~ void SaveAtomVertices (int i, atom_record *a, vertex *v1, vertex *v2) {} -void LoopOverNeighbors (atom_record *atom, neibour_descr *n_atoms, int n_count) -{} +//~ void LoopOverNeighbors (atom_record *atom, neibour_descr *n_atoms, int n_count) +//~ {} CalcVHookFcnType CalcVHookFcn = NULL; diff -ur libproteingeometry-2.1/src-lib/ModifiedVolume.h dpg/libproteingeometry-2.1/src-lib/ModifiedVolume.h --- libproteingeometry-2.1/src-lib/ModifiedVolume.h Wed Apr 9 17:09:18 2003 +++ dpg/libproteingeometry-2.1/src-lib/ModifiedVolume.h Thu Feb 24 20:35:18 2005 @@ -15,11 +15,14 @@ - +/* DPG2 2005-02-24 made SaveAtomVertices & LoopOverNeighbors extern; commented-out in c file */ /* Called from N_calculate_volume() */ -void SaveAtomVertices(int i, atom_record * a, vertex *v1, vertex *v2) +extern void SaveAtomVertices(int i, atom_record * a, vertex *v1, vertex *v2) ; +/* Called from N_calculate_atom_volume(). Similar to N_calculate_vertices(). */ +extern void LoopOverNeighbors(atom_record *atom, neibour_descr *n_atoms,int n_count) +; void N_Calculate_Volumes(file_records *file, int the_method, double volume_max_dist, double distance_check) @@ -32,10 +35,6 @@ */ void NN_Calculate_Volumes (file_records *file, int TheMethod, double VolMaxDist, double DistCheck) -; - -/* Called from N_calculate_atom_volume(). Similar to N_calculate_vertices(). */ -void LoopOverNeighbors(atom_record *atom, neibour_descr *n_atoms,int n_count) ; void Simple_Calculate_Volumes diff -ur libproteingeometry-2.1/src-lib/util.c dpg/libproteingeometry-2.1/src-lib/util.c --- libproteingeometry-2.1/src-lib/util.c Mon Apr 28 23:19:14 2003 +++ dpg/libproteingeometry-2.1/src-lib/util.c Thu Feb 24 20:36:08 2005 @@ -129,18 +129,23 @@ /* ======== */ void prt_time (FILE *stream) /* ======== */ -{ +{ +/* DPG2 2005-02-24 WIN32 defs */ +#ifndef WIN32 struct timeval tv; struct timezone tz; struct timeval *tp; - struct timezone *tzp; + struct timezone *tzp; +#endif long clocktime, *clock = &clocktime; - -# ifdef OFF + +#ifndef WIN32 +# ifdef OFF gettimeofday(tp, tzp); fprintf(stream, "*tp= %ld\n", *tp); fprintf(stream, "ctime= %s\n", (char *) ctime( (long *) tp)); -# endif +# endif +#endif clocktime = time(0); fprintf(stream, "ctime= %s", ctime( clock )); } diff -ur libproteingeometry-2.1/src-lib/util.h dpg/libproteingeometry-2.1/src-lib/util.h --- libproteingeometry-2.1/src-lib/util.h Wed Apr 9 17:09:18 2003 +++ dpg/libproteingeometry-2.1/src-lib/util.h Thu Feb 24 19:13:28 2005 @@ -15,7 +15,11 @@ # include # include # include - + + +/* DPG2 2005-02-24 */ +#include "bsd_compatibility.h" + # include "util.essential.h" # include "little-nr.h" diff -ur libproteingeometry-2.1/src-lib/utils.c dpg/libproteingeometry-2.1/src-lib/utils.c --- libproteingeometry-2.1/src-lib/utils.c Mon Apr 28 23:19:14 2003 +++ dpg/libproteingeometry-2.1/src-lib/utils.c Thu Feb 24 21:54:34 2005 @@ -155,9 +155,19 @@ FILE *stream_from_string (char *string) { - +/* DPG2 2005-02-24 tempfile replacement; this is a poor solution */ +#ifdef WIN32 +#include +#include + int i = rand(); + char s[12+1]; + snprintf(s, 13, "%.8d.tmp", i); + s[12] = '\0'; + FILE * tt = fopen(s, "wb+"); +#else FILE * tt = tmpfile() ; - +#endif + fwrite(string,1,strlen(string), tt) ; rewind (tt);