[paragui-cvs] CVS: paragui/src/physfs physfs.c,1.1.1.1.6.8,1.1.1.1.6.9

[Alexander Pipelka <address@hidden>]

Update of /cvsroot/paragui/paragui/src/physfs
In directory subversions:/tmp/cvs-serv26883/src/physfs

Modified Files:
      Tag: devel-1-0
        physfs.c 
Log Message:
win32 compilation fixes



Index: physfs.c
===================================================================
RCS file: /cvsroot/paragui/paragui/src/physfs/physfs.c,v
retrieving revision 1.1.1.1.6.8
retrieving revision 1.1.1.1.6.9
diff -C2 -r1.1.1.1.6.8 -r1.1.1.1.6.9
*** physfs.c    6 Dec 2002 17:54:51 -0000       1.1.1.1.6.8
--- physfs.c    27 Jan 2003 13:39:07 -0000      1.1.1.1.6.9
***************
*** 1717,1721 ****
          if (buffered == 0) /* need to refill buffer? */
          {
!             PHYSFS_sint64 rc = h->funcs->read(h, h->buffer, 1, h->bufsize);
              if (rc <= 0)
              {
--- 1717,1721 ----
          if (buffered == 0) /* need to refill buffer? */
          {
!             PHYSFS_sint64 rc = h->funcs->read(h, h->buffer, 1, 
(PHYSFS_uint32)h->bufsize);
              if (rc <= 0)
              {
***************
*** 1735,1740 ****
          h->bufpos += buffered;
          buffered += remainder;  /* take remainder into account. */
!         copied = (buffered / objSize);
!         remainder = (buffered % objSize);
          retval += copied;
          objCount -= copied;
--- 1735,1740 ----
          h->bufpos += buffered;
          buffered += remainder;  /* take remainder into account. */
!         copied = (PHYSFS_uint32)(buffered / objSize);
!         remainder = (PHYSFS_uint32)(buffered % objSize);
          retval += copied;
          objCount -= copied;
***************
*** 1859,1863 ****
      else
      {
!         PHYSFS_uint8 *newbuf = realloc(h->buffer, bufsize);
          BAIL_IF_MACRO(newbuf == NULL, ERR_OUT_OF_MEMORY, 0);
          h->buffer = newbuf;
--- 1859,1863 ----
      else
      {
!         PHYSFS_uint8 *newbuf = realloc(h->buffer, (PHYSFS_uint32)bufsize);
          BAIL_IF_MACRO(newbuf == NULL, ERR_OUT_OF_MEMORY, 0);
          h->buffer = newbuf;
***************
*** 1879,1883 ****
  
      /* dump buffer to disk. */
!     rc = h->funcs->write(h, h->buffer + h->bufpos, h->buffill - h->bufpos, 1);
      BAIL_IF_MACRO(rc <= 0, NULL, 0);
  
--- 1879,1883 ----
  
      /* dump buffer to disk. */
!     rc = h->funcs->write(h, h->buffer + h->bufpos, (PHYSFS_uint32)(h->buffill 
- h->bufpos), 1);
      BAIL_IF_MACRO(rc <= 0, NULL, 0);