Mercurial > mxe-octave

comparison src/physfs-1-fix-gcc46-warnings.patch @ 1707:4e48476ea587

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix compiler errors instead of suppressing them
author Volker Grabsch <vog@notjusthosting.com>
date Sun, 27 Mar 2011 15:49:26 +0200
parents
children f653602a0500
comparison
equal deleted inserted replaced
1706:9e49c835d73e 1707:4e48476ea587
1 This file is part of mingw-cross-env.
2 See doc/index.html for further information.
3
4 This patch has been taken from:
5 http://icculus.org/pipermail/physfs/2011-March/000990.html
6
7 diff -ru physfs-2.0.2.orig/archivers/wad.c physfs-2.0.2/archivers/wad.c
8 --- physfs-2.0.2.orig/archivers/wad.c 2011-02-18 22:17:31.000000000 +0100
9 +++ physfs-2.0.2/archivers/wad.c 2011-03-27 14:55:10.000000000 +0200
10 @@ -245,9 +245,6 @@
11 PHYSFS_uint32 fileCount;
12 PHYSFS_uint32 directoryOffset;
13 WADentry *entry;
14 - char lastDirectory[9];
15 -
16 - lastDirectory[8] = 0; /* Make sure lastDirectory stays null-terminated. */
17
18 BAIL_IF_MACRO(!wad_open(name, forWriting, &fh, &fileCount,&directoryOffset), NULL, 0);
19 info->entryCount = fileCount;
20 diff -ru physfs-2.0.2.orig/platform/windows.c physfs-2.0.2/platform/windows.c
21 --- physfs-2.0.2.orig/platform/windows.c 2011-02-18 22:17:31.000000000 +0100
22 +++ physfs-2.0.2/platform/windows.c 2011-03-27 14:54:17.000000000 +0200
23 @@ -462,6 +462,7 @@
24 */
25 rc = pGetUserProfileDirectoryW(accessToken, &dummy, &psize);
26 assert(!rc); /* !!! FIXME: handle this gracefully. */
27 + (void)rc;
28
29 /* Allocate memory for the profile directory */
30 wstr = (LPWSTR) __PHYSFS_smallAlloc(psize * sizeof (WCHAR));