Last night I did a cvs update and built, and got a build failure dlls/amstream/amstream.c:40: parse error before "AM_Vtbl"
Evidently cvs update failed to update the files in dlls/amstream, as it failed to pick up that part of this change:
2004-08-12 Alexandre Julliard julliard@winehq.com
* dlls/amstream/amstream.c, dlls/amstream/main.c, dlls/avifil32/acmstream.c, dlls/avifil32/avifile.c, ... dlls/winmm/wineaudioio/audio.c, dlls/winmm/wineoss/audio.c, include/objbase.h, include/rpcproxy.h: Get rid of the non-standard ICOM_VTABLE macro.
Repeated 'cvs update's didn't fix it. cd'ing into dlls/amstream and doing a cvs update directly in that directory worked, though, and got me new versions of the files in that directory.
How strange. Maybe I'll stop using this newfangled cvs system and fall back on the old reliable ... uh, wait, cvs *is* the old reliable one... grr... - Dan
Try "cvs update -dPR", that fixed a similar problem for me once (not in wine, though) (-d adds new directories, -P removes empty directories, -R recurses into subdirs)
--Michael
-----Original Message----- From: wine-devel-admin@winehq.org [mailto:wine-devel-admin@winehq.org] On Behalf Of Dan Kegel Sent: Saturday, October 09, 2004 4:20 PM To: Wine Devel Subject: cvs update mystery
Last night I did a cvs update and built, and got a build failure dlls/amstream/amstream.c:40: parse error before "AM_Vtbl"
Evidently cvs update failed to update the files in dlls/amstream, as it failed to pick up that part of this change:
2004-08-12 Alexandre Julliard julliard@winehq.com
* dlls/amstream/amstream.c, dlls/amstream/main.c, dlls/avifil32/acmstream.c, dlls/avifil32/avifile.c, ... dlls/winmm/wineaudioio/audio.c, dlls/winmm/wineoss/audio.c, include/objbase.h, include/rpcproxy.h: Get rid of the non-standard ICOM_VTABLE macro.
Repeated 'cvs update's didn't fix it. cd'ing into dlls/amstream and doing a cvs update directly in that directory worked, though, and got me new versions of the files in that directory.
How strange. Maybe I'll stop using this newfangled cvs system and fall back on the old reliable ... uh, wait, cvs *is* the old reliable one... grr... - Dan
On Sun, 10 Oct 2004, Michael Drüing wrote:
Try "cvs update -dPR", that fixed a similar problem for me once (not in wine, though) (-d adds new directories, -P removes empty directories, -R recurses into subdirs)
-P and -d seem unlikely to change anything though it's a good idea to put them in ~/.cvsrc. -R seems redundant, cvs already recurses into subdirectories without it (unless you told it not to in ~/.cvsrc?).
However you may try -A which tell cvs to remove sticky tags. It's useful if you checked out a specific version of a file (e.g. using -r or -D) but now want to get the latest version.
-
Dan Kegel -
Francois Gouget -
Michael Drüing