ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/util/rcollate.c
(Generate patch)

Comparing ray/src/util/rcollate.c (file contents):
Revision 2.20 by greg, Tue Jun 16 19:06:29 2015 UTC vs.
Revision 2.23 by schorsch, Sun Mar 6 01:13:18 2016 UTC

# Line 11 | Line 11 | static const char RCSid[] = "$Id$";
11   #include "platform.h"
12   #include "rtio.h"
13   #include "resolu.h"
14 < #ifdef _WIN32
15 < #undef ftello
16 < #define ftello  ftell
17 < #undef ssize_t
18 < #define ssize_t size_t
14 > #if defined(_WIN32) || defined(_WIN64)
15 >  #undef ftello
16 >  #define       ftello  ftell
17 >  #undef ssize_t
18 >  #define ssize_t       size_t
19   #else
20 < #include <sys/mman.h>
20 >  #include <sys/mman.h>
21   #endif
22  
23 #ifdef getc_unlocked            /* avoid horrendous overhead of flockfile */
24 #undef getc
25 #undef putc
26 #define getc    getc_unlocked
27 #define putc    putc_unlocked
28 #endif
29
23   typedef struct {
24          void    *base;          /* pointer to base memory */
25          size_t  len;            /* allocated memory length */
# Line 74 | Line 67 | load_stream(MEMLOAD *mp, FILE *fp)
67                  return(-1);
68          while ((nr = fread(buf, 1, sizeof(buf), fp)) > 0) {
69                  if (!alloced)
70 <                        mp->base = malloc(nr);
70 >                        mp->base = malloc(alloced = nr);
71                  else if (mp->len+nr > alloced)
72                          mp->base = realloc(mp->base,
73                                  alloced = alloced*(2+(nr==sizeof(buf)))/2+nr);
# Line 99 | Line 92 | load_file(MEMLOAD *mp, FILE *fp)
92          int     fd;
93          off_t   skip, flen;
94  
95 < #ifdef _WIN32                           /* too difficult to fix this */
95 > #if defined(_WIN32) || defined(_WIN64)
96 >                                /* too difficult to fix this */
97          return load_stream(mp, fp);
98   #endif
99          if (mp == NULL)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines