| 18 |
|
#include "triangulate.h" |
| 19 |
|
#include "platform.h" |
| 20 |
|
|
| 21 |
– |
#ifdef getc_unlocked /* avoid horrendous overhead of flockfile */ |
| 22 |
– |
#undef getc |
| 23 |
– |
#define getc getc_unlocked |
| 24 |
– |
#endif |
| 25 |
– |
|
| 21 |
|
#define MAXRCARG 512 |
| 22 |
|
|
| 23 |
|
char *progname; /* global argv[0] */ |
| 181 |
|
return(popen(cmd, mode)); |
| 182 |
|
} |
| 183 |
|
|
| 184 |
< |
#ifdef _WIN32 |
| 184 |
> |
#if defined(_WIN32) || defined(_WIN64) |
| 185 |
|
/* Execute system command (Windows version) */ |
| 186 |
|
static int |
| 187 |
|
my_exec(char *av[]) |
| 643 |
|
if (p->nsurfs > nall) { /* (re)allocate surface area cache */ |
| 644 |
|
if (projsa) free(projsa); |
| 645 |
|
projsa = (double *)malloc(sizeof(double)*p->nsurfs); |
| 646 |
< |
if (!projsa) return(0); |
| 646 |
> |
if (projsa == NULL) { |
| 647 |
> |
fputs(progname, stderr); |
| 648 |
> |
fputs(": out of memory in sample_origin!\n", stderr); |
| 649 |
> |
exit(1); |
| 650 |
> |
} |
| 651 |
|
nall = p->nsurfs; |
| 652 |
|
} |
| 653 |
|
/* compute projected areas */ |
| 946 |
|
snew = (SURF *)malloc(sizeof(SURF) + sizeof(double)*(n-1)); |
| 947 |
|
if (snew == NULL) { |
| 948 |
|
fputs(progname, stderr); |
| 949 |
< |
fputs(": out of memory!\n", stderr); |
| 949 |
> |
fputs(": out of memory in add_surface!\n", stderr); |
| 950 |
|
exit(1); |
| 951 |
|
} |
| 952 |
|
strncpy(snew->sname, oname, sizeof(snew->sname)-1); |
