imach/src/imach.c - diff

Return to imach.c CVS log

Up to [Local Repository] / imach / src

Diff for /imach/src/imach.c between versions 1.158 and 1.160

version 1.158, 2014/08/27 17:11:51	version 1.160, 2014/09/02 09:24:05
Line 1	Line 1
/* $Id$	/* $Id$
$State$	$State$
$Log$	$Log$
	Revision 1.160 2014/09/02 09:24:05 brouard
	* empty log message *

	Revision 1.159 2014/09/01 10:34:10 brouard
	Summary: WIN32
	Author: Brouard

Revision 1.158 2014/08/27 17:11:51 brouard	Revision 1.158 2014/08/27 17:11:51 brouard
* empty log message *	* empty log message *

Line 478	Line 485
#include <stdio.h>	#include <stdio.h>
#include <stdlib.h>	#include <stdlib.h>
#include <string.h>	#include <string.h>

	#ifdef _WIN32
	#include <io.h>
	#else
#include <unistd.h>	#include <unistd.h>
	#endif

#include <limits.h>	#include <limits.h>
#include <sys/types.h>	#include <sys/types.h>
#include <sys/stat.h>	#include <sys/stat.h>
#include <errno.h>	#include <errno.h>
extern int errno;	/* extern int errno; */

/* #ifdef LINUX */	/* #ifdef LINUX */
/* #include <time.h> */	/* #include <time.h> */
Line 777 char cutl(char blocc, char *alocc, cha	Line 789 char cutl(char blocc, char *alocc, cha
gives blocc="abcdef2ghi" and alocc="j".	gives blocc="abcdef2ghi" and alocc="j".
If occ is not found blocc is null and alocc is equal to in. Returns blocc	If occ is not found blocc is null and alocc is equal to in. Returns blocc
*/	*/
char s, t, *bl;	char s, t;
t=in;s=in;	t=in;s=in;
while ((in != occ) && (in != '\0')){	while ((in != occ) && (in != '\0')){
alocc++ = in++;	alocc++ = in++;
Line 861 int nbocc(char *s, char occ)	Line 873 int nbocc(char *s, char occ)
/* } */	/* } */
/* } */	/* } */

	#ifdef _WIN32
	char * strsep(char *pp, const char delim)
	{
	char p, q;

	if ((p = *pp) == NULL)
	return 0;
	if ((q = strpbrk (p, delim)) != NULL)
	{
	*pp = q + 1;
	*q = '\0';
	}
	else
	*pp = 0;
	return p;
	}
	#endif

/******************** nrerror ******************/	/******************** nrerror ******************/

void nrerror(char error_text[])	void nrerror(char error_text[])
Line 1083 double brent(double ax, double bx, doubl	Line 1113 double brent(double ax, double bx, doubl
{	{
int iter;	int iter;
double a,b,d,etemp;	double a,b,d,etemp;
double fu,fv,fw,fx;	double fu=0,fv,fw,fx;
double ftemp;	double ftemp;
double p,q,r,tol1,tol2,u,v,w,x,xm;	double p,q,r,tol1,tol2,u,v,w,x,xm;
double e=0.0;	double e=0.0;
Line 6750 Interval (in months) between two waves:	Line 6780 Interval (in months) between two waves:
scanf("%s",z);	scanf("%s",z);
}	}
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.158
changed lines
	Added in v.1.160