Changes - j0ke.net Open Build Service

Changes of Revision 2

[-] [+]	Changed	libebml.spec
@@ -1,7 +1,7 @@ # -# spec file for package libebml (Version 0.7.7) +# spec file for package libebml (Version 0.7.8) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -9,15 +9,15 @@ # # norootforbuild -# usedforbuild aaa_base acl attr audit-libs autoconf automake bash bind-libs bind-utils binutils bison bzip2 coreutils cpio cpp cracklib cvs cyrus-sasl db diffutils e2fsprogs file filesystem fillup findutils flex gawk gcc gcc-c++ gdbm gdbm-devel gettext gettext-devel glibc glibc-devel glibc-locale gpm grep groff gzip info insserv klogd less libacl libattr libcom_err libgcc libnscd libstdc++ libstdc++-devel libtool libxcrypt libzio m4 make man mktemp module-init-tools ncurses ncurses-devel net-tools netcfg openldap2-client openssl pam pam-modules patch perl permissions popt procinfo procps psmisc pwdutils rcs readline rpm sed strace sysvinit tar tcpd texinfo timezone unzip util-linux vim zlib zlib-devel + Name: libebml BuildRequires: gcc-c++ -URL: http://sourceforge.net/projects/ebml -Version: 0.7.7 -Release: 5 +Url: http://dl.matroska.org/downloads/libebml/ +Version: 0.7.8 +Release: 53 Summary: Libary to Parse EBML Files -License: LGPL +License: LGPL v2.1 or later Group: Development/Libraries/Other Source: %{name}-%{version}.tar.bz2 Patch1: makefile.diff @@ -36,12 +36,26 @@ -------- Steve Lhomme <steve.lhomme@free.fr> -%debug_package +%package devel +Summary: Libary to Parse EBML Files +Group: Development/Libraries/Other +Provides: libebml:/usr/include/ebml/EbmlElement.h +Requires: libebml = %{version} +AutoReqProv: on + +%description devel +libebml is a C++ library to parse EBML files. See the EBML RFV at +http://www.matroska.org/technical/specs/rfc/. + + + +Authors: +-------- + Steve Lhomme <steve.lhomme@free.fr> + %prep -rm -rf $RPM_BUILD_ROOT %setup %patch1 -p1 -# %patch2 -p1 %build %ifarch %arm @@ -50,6 +64,7 @@ %else export CFLAGS="$RPM_OPT_FLAGS" %endif +export CXXFLAGS="$CFLAGS" cd make/linux make PREFIX=$RPM_BUILD_ROOT/usr LIBDIR=%{_libdir} @@ -60,42 +75,52 @@ %clean rm -rf $RPM_BUILD_ROOT -%post -%run_ldconfig +%post -p /sbin/ldconfig -%postun -%run_ldconfig +%postun -p /sbin/ldconfig %files %defattr (-,root,root) -%{_libdir}/libebml* +%{_libdir}/libebml.so. + +%files devel +%defattr (-,root,root) +%{_libdir}/libebml.so +%{_libdir}/libebml.a /usr/include/ebml -%changelog -n libebml -* Sun Sep 30 2007 Carsten Schoene <cs@linux-administrator.com> -- import for SLE_10 build -* Fri Mar 31 2006 - seife@suse.de +%changelog +* Wed Mar 5 2008 seife@suse.de +- update to version 0.7.8 - only gcc-4.3 build fixes +- remove our gcc-4.3 patch +* Wed Oct 24 2007 seife@suse.de +- fix gcc-43 build problems (bugs 330737, 336510) +* Sat May 26 2007 ro@suse.de +- split off devel package +* Tue Oct 31 2006 meissner@suse.de +- use RPM_OPT_FLAGS +* Fri Mar 31 2006 seife@suse.de - update to version 0.7.7 bugfix release that fixes pointer aliasing issues -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Mon Nov 21 2005 - seife@suse.de +* Mon Nov 21 2005 seife@suse.de - version update to 0.7.6 -* Tue Nov 15 2005 - uli@suse.de +* Tue Nov 15 2005 uli@suse.de - build with -O1 on ARM (ICE workaround) -* Wed Nov 02 2005 - dmueller@suse.de +* Wed Nov 2 2005 dmueller@suse.de - don't build as root -* Tue Jul 05 2005 - seife@suse.de +* Tue Jul 5 2005 seife@suse.de - version update to 0.7.5 -* Sun Apr 17 2005 - seife@suse.de +* Sun Apr 17 2005 seife@suse.de - version update to 0.7.4 -* Fri Apr 15 2005 - sf@suse.de +* Fri Apr 15 2005 sf@suse.de - changed patch to only prevent 'unary lvalue error' for GCC4 -* Thu Apr 14 2005 - yxu@suse.de +* Thu Apr 14 2005 yxu@suse.de - fixed for GCC4 -* Mon Feb 07 2005 - seife@suse.de +* Mon Feb 7 2005 seife@suse.de - version update to 0.7.3 -* Tue Oct 26 2004 - seife@suse.de +* Tue Oct 26 2004 seife@suse.de - version update to 0.7.2 -* Wed Sep 01 2004 - seife@suse.de +* Wed Sep 1 2004 seife@suse.de - initial submission
[-] [+]	Changed	libebml-0.7.8.tar.bz2/ChangeLog ^
@@ -1,3 +1,173 @@ +2008-02-21 22:14 mosu + + * trunk/libebml/ebml/EbmlBinary.h, trunk/libebml/ebml/EbmlEndian.h, + trunk/libebml/ebml/MemIOCallback.h, + trunk/libebml/ebml/c/libebml_t.h, + trunk/libebml/src/StdIOCallback.cpp: Fixes for the compilation + with gcc 4.3 + +2007-02-17 10:55 robux4 + + * trunk/ARCorrect/ARCorrect.h, trunk/ARCorrect/ARCorrectFilter.h, + trunk/ARCorrect/ARCorrectPage.h, trunk/ARCorrect/ARCorrect_GUID.h, + trunk/ARCorrect/DShowUtils.h, trunk/ARCorrect/ITrackInfo.h, + trunk/ARCorrect/PersistPropertyBag.h, trunk/ARCorrect/resource.h, + trunk/DvdMenuXtractor/DvdMenuXtractor.proj, + trunk/DvdMenuXtractor/chaptermanager.h, + trunk/DvdMenuXtractor/config.h, trunk/DvdMenuXtractor/dmx.h, + trunk/DvdMenuXtractor/dmxconsole.h, + trunk/DvdMenuXtractor/dmxlogwidget.h, + trunk/DvdMenuXtractor/dmxselectionitem.h, + trunk/DvdMenuXtractor/dmxselectiontree.h, + trunk/DvdMenuXtractor/dmxwizard.h, + trunk/DvdMenuXtractor/libdvdread/dvdread/bswap.h, + trunk/DvdMenuXtractor/libdvdread/dvdread/cmd_print.h, + trunk/DvdMenuXtractor/libdvdread/dvdread/dvd_input.h, + trunk/DvdMenuXtractor/libdvdread/dvdread/dvd_reader.h, + trunk/DvdMenuXtractor/libdvdread/dvdread/dvd_udf.h, + trunk/DvdMenuXtractor/libdvdread/dvdread/dvdread.proj, + trunk/DvdMenuXtractor/libdvdread/dvdread/dvdread_internal.h, + trunk/DvdMenuXtractor/libdvdread/dvdread/ifo_print.h, + trunk/DvdMenuXtractor/libdvdread/dvdread/ifo_read.h, + trunk/DvdMenuXtractor/libdvdread/dvdread/ifo_types.h, + trunk/DvdMenuXtractor/libdvdread/dvdread/md5.h, + trunk/DvdMenuXtractor/libdvdread/dvdread/nav_print.h, + trunk/DvdMenuXtractor/libdvdread/dvdread/nav_read.h, + trunk/DvdMenuXtractor/libdvdread/dvdread/nav_types.h, + trunk/DvdMenuXtractor/libdvdread/libdvdread.proj, + trunk/DvdMenuXtractor/libdvdread/src/src.proj, + trunk/DvdMenuXtractor/libdvdread/win32/config.h, + trunk/DvdMenuXtractor/libdvdread/win32/dirent.h, + trunk/DvdMenuXtractor/libdvdread/win32/gtchar.h, + trunk/DvdMenuXtractor/libdvdread/win32/inttypes.h, + trunk/DvdMenuXtractor/libdvdread/win32/posix.h, + trunk/DvdMenuXtractor/libdvdread/win32/stdint.h, + trunk/DvdMenuXtractor/libdvdread/win32/win32.proj, + trunk/DvdMenuXtractor/logtextedit.h, + trunk/DvdMenuXtractor/mpegparser/CircBuffer.h, + trunk/DvdMenuXtractor/mpegparser/M2VParser.h, + trunk/DvdMenuXtractor/mpegparser/MPEGVideoBuffer.h, + trunk/DvdMenuXtractor/mpegparser/Types.h, + trunk/DvdMenuXtractor/mpegparser/mpegparser.proj, + trunk/DvdMenuXtractor/outputreader.h, + trunk/DvdMenuXtractor/selectiontreeitem.h, + trunk/DvdMenuXtractor/selectiontreesubitem.h, + trunk/DvdMenuXtractor/utilities.h, + trunk/DvdMenuXtractor/vobparser/IFOContent.h, + trunk/DvdMenuXtractor/vobparser/IFOFile.h, + trunk/DvdMenuXtractor/vobparser/VobParser.h, + trunk/DvdMenuXtractor/vobparser/iso/iso_lang.h, + trunk/DvdMenuXtractor/vobparser/vobparser.proj, + trunk/LemAPI/ac3_input/ac3file.h, + trunk/LemAPI/ac3_input/ac3frame.h, + trunk/LemAPI/ac3_input/ac3iframe.h, + trunk/LemAPI/ac3_input/c_types.h, trunk/LemAPI/avi_input/avilib.h, + trunk/LemAPI/matroska_writer/matroska_writer.h, + trunk/LemAPI/matroska_writer/matroska_writer_gui.h, + trunk/LemAPI/mpa_input/c_types.h, + trunk/LemAPI/mpa_input/mpafile.h, + trunk/LemAPI/mpa_input/mpaframe.h, + trunk/LemAPI/mpa_input/mpiframe.h, trunk/LemAPI/tinyXML/tinystr.h, + trunk/LemAPI/tinyXML/tinyxml.h, trunk/LemAPI/wav_input/Config.h, + trunk/LemAPI/wav_input/Endian.h, trunk/LemAPI/wav_input/FourCC.h, + trunk/LemAPI/wav_input/Types.h, trunk/LemAPI/wav_input/c_types.h, + trunk/LemAPI/wav_input/chunk.h, trunk/LemAPI/wav_input/fact.h, + trunk/LemAPI/wav_input/fio.h, trunk/LemAPI/wav_input/format.h, + trunk/LemAPI/wav_input/riff.h, trunk/LemAPI/wav_input/wav.h, + trunk/LemAPI/wav_input/wav2mka.h, + trunk/MatroskaUtils/AviTagReader.h, + trunk/MatroskaUtils/CFireRoutine.h, trunk/MatroskaUtils/DbgOut.h, + trunk/MatroskaUtils/GDC/GDCMatroska/GDCMatroska_h.h, + trunk/MatroskaUtils/GDC/GDCMatroska/IndexMatroska.h, + trunk/MatroskaUtils/GDC/GDCMatroska/MatroskaParser.h, + trunk/MatroskaUtils/GDC/GDCMatroska/Win32Stream.h, + trunk/MatroskaUtils/GDC/GDCMatroska/resource.h, + trunk/MatroskaUtils/GDC/GDCMatroska/stdafx.h, + trunk/MatroskaUtils/GDC/common/GoogleDesktopComponentRegistration.h, + trunk/MatroskaUtils/GDC/common/GoogleDesktopSearchAPI.h, + trunk/MatroskaUtils/GDC/common/stdafx.h, + trunk/MatroskaUtils/JCThread.h, trunk/MatroskaUtils/JList.h, + trunk/MatroskaUtils/JString.h, trunk/MatroskaUtils/MP3TagReader.h, + trunk/MatroskaUtils/MatroskaCDL/CDLApi.h, + trunk/MatroskaUtils/MatroskaCDL/MatroskaCDL.h, + trunk/MatroskaUtils/MatroskaChapterData.h, + trunk/MatroskaUtils/MatroskaPages.h, + trunk/MatroskaUtils/MatroskaReg.h, + trunk/MatroskaUtils/MatroskaTagData.h, + trunk/MatroskaUtils/MatroskaTrackData.h, + trunk/MatroskaUtils/MatroskaUtils.h, + trunk/MatroskaUtils/MatroskaUtilsBitrate.h, + trunk/MatroskaUtils/MatroskaUtilsDebug.h, + trunk/MatroskaUtils/MatroskaUtilsReader.h, + trunk/MatroskaUtils/ShellExtension/CheckUsage/CheckUsage.h, + trunk/MatroskaUtils/ShellExtension/CheckUsage/resource.h, + trunk/MatroskaUtils/ShellExtension/DShowTools/DShowTools.h, + trunk/MatroskaUtils/ShellExtension/DShowTools/convert.h, + trunk/MatroskaUtils/ShellExtension/Http.h, + trunk/MatroskaUtils/ShellExtension/MatroskaInfoParserCache.h, + trunk/MatroskaUtils/ShellExtension/MatroskaProp.h, + trunk/MatroskaUtils/ShellExtension/MatroskaPropShellExtension.h, + trunk/MatroskaUtils/TagReader.h, trunk/MatroskaUtils/ZipArchive.h, + trunk/MatroskaUtils/mdump.h, trunk/MatroskaUtils/resource.h, + trunk/MatroskaUtils/tinyxml/tinystr.h, trunk/config.h, + trunk/foo_input_matroska/DbgOut.h, + trunk/foo_input_matroska/Foobar2000ReaderIOCallback.h, + trunk/foo_input_matroska/container_matroska.h, + trunk/foo_input_matroska/container_matroska_impl.h, + trunk/foo_input_matroska/filesystem_matroska.h, + trunk/foo_input_matroska/matroska_parser.h, + trunk/foo_input_matroska/resource.h, trunk/libebml/libebml.proj, + trunk/libmatroska/libmatroska.proj, + trunk/libmatroska/matroska/KaxTag.h, + trunk/libmatroska/test/ebml/ebml.proj, + trunk/libmatroska/test/mux/mux.proj, + trunk/libmatroska/test/tags/tags.proj, + trunk/libmatroska/test/test.proj, + trunk/libmatroska/test/utf8/utf8.proj, + trunk/mkaencoder/src/mkaenc.h, + trunk/mkvwriter/IOCallbackWrapper.h, + trunk/mkvwriter/MatroskaMuxer.h, + trunk/mkvwriter/MatroskaSimpleTags.h, trunk/mkvwriter/mkvwriter.h, + trunk/mkvwriter/pub/hxtmkvwriter.h, trunk/mkxds/CoreVorbisGUID.h, + trunk/mkxds/MatroskaReader.h, trunk/mkxds/OggDS.h, + trunk/mkxds/Subtitles.h, trunk/mkxds/asyncio.h, + trunk/mkxds/codecs.h, trunk/mkxds/global.h, + trunk/mkxds/mkxPrioFrame.h, trunk/mkxds/mkx_opin.h, + trunk/mkxds/mkxds.h, trunk/mkxds/mkxdsProperty.h, + trunk/mkxds/mkxread.h, trunk/mkxds/resource.h, + trunk/mkxuncat/mkxuncat.proj, trunk/root.proj: fix EOL style + +2007-01-22 11:21 robux4 + + * trunk/libebml/libebml.proj: don't use the debug(trace) class by + default + +2007-01-19 10:15 robux4 + + * trunk/libebml/src/Debug.cpp: build even in a Unicode environment + +2007-01-19 09:58 robux4 + + * trunk/libebml/libebml.proj, trunk/libmatroska/libmatroska.proj, + trunk/libmatroska/test/ebml/ebml.proj, + trunk/libmatroska/test/mux/mux.proj, + trunk/libmatroska/test/tags/tags.proj, + trunk/libmatroska/test/test.proj, + trunk/libmatroska/test/utf8/utf8.proj: add support for coremake + building for the moment the config.h and coremake are referenced + by a parent project + +2006-06-02 14:32 mosu + + * trunk/libebml/make/linux/Makefile: Overwrite existing symlinks + during install. + +2006-03-31 12:33 mosu + + * trunk/libebml/ChangeLog, trunk/libebml/debian/changelog, + trunk/libebml/ebml/EbmlVersion.h: Bumped version to 0.7.7. + Automatic ChangeLog update. + 2006-03-30 19:33 mosu * trunk/libebml/src/EbmlFloat.cpp: Avoid pointer aliasing issues.
[-] [+]	Changed	libebml-0.7.8.tar.bz2/debian/changelog ^
@@ -1,3 +1,9 @@ +libebml (0.7.8-1) unstable; urgency=low + + * New version. + + -- Moritz Bunkus <moritz@bunkus.org> Wed, 5 Mar 2008 12:04:07 +0100 + libebml (0.7.7-1) unstable; urgency=low * New version.
[-] [+]	Changed	libebml-0.7.8.tar.bz2/ebml/EbmlBinary.h ^
@@ -30,7 +30,7 @@ /! \file - \version \$Id: EbmlBinary.h 1112 2005-03-28 09:55:50Z mosu $ + \version \$Id: EbmlBinary.h 1298 2008-02-21 22:14:18Z mosu $ \author Steve Lhomme <robux4 @ users.sf.net> \author Julien Coloos <suiryc @ users.sf.net> / @@ -38,6 +38,7 @@ #define LIBEBML_BINARY_H #include <string> +#include <cstring> #include "EbmlTypes.h" #include "EbmlElement.h"
[-] [+]	Changed	libebml-0.7.8.tar.bz2/ebml/EbmlEndian.h ^
@@ -30,7 +30,7 @@ /*! \file - \version \$Id: EbmlEndian.h 1155 2005-05-06 11:43:38Z robux4 $ + \version \$Id: EbmlEndian.h 1298 2008-02-21 22:14:18Z mosu $ \author Ingo Ralf Blum <ingoralfblum @ users.sf.net> \author Lasse Kärkkäinen <tronic @ users.sf.net> \author Steve Lhomme <robux4 @ users.sf.net> @@ -39,6 +39,7 @@ #define LIBEBML_ENDIAN_H #include <algorithm> +#include <cstring> #include "EbmlConfig.h" // contains _ENDIANESS_
[-] [+]	Changed	libebml-0.7.8.tar.bz2/ebml/EbmlVersion.h ^
@@ -30,7 +30,7 @@ /! \file - \version \$Id: EbmlVersion.h 1245 2006-03-31 12:33:02Z mosu $ + \version \$Id: EbmlVersion.h 1299 2008-03-05 11:06:00Z mosu $ \author Steve Lhomme <robux4 @ users.sf.net> / #ifndef LIBEBML_VERSION_H @@ -42,9 +42,9 @@ START_LIBEBML_NAMESPACE -#define LIBEBML_VERSION 0x000707 +#define LIBEBML_VERSION 0x000708 -static const std::string EbmlCodeVersion = "0.7.7"; +static const std::string EbmlCodeVersion = "0.7.8"; static const std::string EbmlCodeDate = __TIMESTAMP__; /*!
[-] [+]	Changed	libebml-0.7.8.tar.bz2/ebml/MemIOCallback.h ^
@@ -28,7 +28,7 @@ /! \file - \version \$Id: MemIOCallback.h 639 2004-07-09 20:59:14Z mosu $ + \version \$Id: MemIOCallback.h 1298 2008-02-21 22:14:18Z mosu $ \author Jory Stone <jcsston @ toughguy.net> / #ifndef LIBEBML_MEMIOCALLBACK_H @@ -36,10 +36,6 @@ #include "IOCallback.h" #include <string> -// Several gcc versions have some header problem, others don't - -// but those that do will have problems with min being defined as a -// macro upon inclusion of some stream header. -#undef min #ifndef __BEOS__ #include <sstream> #else
[-] [+]	Changed	libebml-0.7.8.tar.bz2/ebml/c/libebml_t.h ^
@@ -30,7 +30,7 @@ /*! \file libebml_t.h - \version \$Id: libebml_t.h 1011 2005-01-05 16:15:25Z robux4 $ + \version \$Id: libebml_t.h 1298 2008-02-21 22:14:18Z mosu $ \author Steve Lhomme <robux4 @ users.sf.net> \author Ingo Ralf Blum <ingoralfblum @ users.sf.net> \author Moritz Bunkus <moritz@bunkus.org> @@ -123,9 +123,7 @@ MODE_SAFE } open_mode; -#if !defined(min) -#define min(x,y) ((x)<(y) ? (x) : (y)) -#endif +#define EBML_MIN(x,y) ((x)<(y) ? (x) : (y)) #ifdef __cplusplus }
[-] [+]	Added	libebml-0.7.8.tar.bz2/libebml.proj ^
@@ -0,0 +1,62 @@ +Include "/.proj" + +LIB ebml +{ + INCLUDE . + +// OPTIMIZE_GLOBALLY . + FAVOR_MAX_SPEED . + REDUCE_SIZE . + FASTER_FLOAT . + +// SOURCE src/Debug.cpp + SOURCE src/EbmlBinary.cpp + SOURCE src/EbmlContexts.cpp + SOURCE src/EbmlCrc32.cpp + SOURCE src/EbmlDate.cpp + SOURCE src/EbmlDummy.cpp + SOURCE src/EbmlElement.cpp + SOURCE src/EbmlFloat.cpp + SOURCE src/EbmlHead.cpp + SOURCE src/EbmlMaster.cpp + SOURCE src/EbmlSInteger.cpp + SOURCE src/EbmlStream.cpp + SOURCE src/EbmlString.cpp + SOURCE src/EbmlSubHead.cpp + SOURCE src/EbmlUInteger.cpp + SOURCE src/EbmlUnicodeString.cpp + SOURCE src/EbmlVersion.cpp + SOURCE src/EbmlVoid.cpp + SOURCE src/IOCallback.cpp + SOURCE src/MemIOCallback.cpp + SOURCE src/StdIOCallback.cpp + SOURCE(TARGET_WIN) src/platform/win32/WinIOCallback.cpp + + HEADER(TARGET_WIN) src/platform/win32/WinIOCallback.h +// HEADER ebml/Debug.h + HEADER ebml/EbmlBinary.h + HEADER ebml/EbmlConfig.h + HEADER ebml/EbmlContexts.h + HEADER ebml/EbmlCrc32.h + HEADER ebml/EbmlDate.h + HEADER ebml/EbmlDummy.h + HEADER ebml/EbmlElement.h + HEADER ebml/EbmlEndian.h + HEADER ebml/EbmlFloat.h + HEADER ebml/EbmlHead.h + HEADER ebml/EbmlId.h + HEADER ebml/EbmlMaster.h + HEADER ebml/EbmlSInteger.h + HEADER ebml/EbmlStream.h + HEADER ebml/EbmlString.h + HEADER ebml/EbmlSubHead.h + HEADER ebml/EbmlTypes.h + HEADER ebml/EbmlUInteger.h + HEADER ebml/EbmlUnicodeString.h + HEADER ebml/EbmlVersion.h + HEADER ebml/EbmlVoid.h + HEADER ebml/IOCallback.h + HEADER ebml/MemIOCallback.h + HEADER ebml/StdIOCallback.h + HEADER ebml/c/libebml_t.h +}
[-] [+]	Changed	libebml-0.7.8.tar.bz2/make/linux/Makefile ^
@@ -141,7 +141,7 @@ install_sharedlib: $(LIBRARY_SO) $(INSTALL) $(INSTALL_DIR_OPTS) -d $(libdir) $(INSTALL) $(INSTALL_OPTS_LIB) $(LIBRARY_SO_VER) $(libdir) - ln -s $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO) + ln -fs $(LIBRARY_SO_VER) $(libdir)/$(LIBRARY_SO) ifneq ($(wildcard .depend),)
[-] [+]	Changed	libebml-0.7.8.tar.bz2/src/Debug.cpp ^
@@ -30,7 +30,7 @@ /! \file - \version \$Id: Debug.cpp 1198 2005-08-26 08:18:50Z mosu $ + \version \$Id: Debug.cpp 1268 2007-01-19 10:15:08Z robux4 $ \author Steve Lhomme <robux4 @ users.sf.net> \author Moritz Bunkus <moritz @ bunkus.org> / @@ -84,7 +84,7 @@ SYSTEMTIME time; GetSystemTime(&time); if (prefix[0] == '\0') - wsprintf(myformat,"%04d/%02d/%02d %02d:%02d:%02d.%03d UTC : %s\r\n", + wsprintfA(myformat,"%04d/%02d/%02d %02d:%02d:%02d.%03d UTC : %s\r\n", time.wYear, time.wMonth, time.wDay, @@ -94,7 +94,7 @@ time.wMilliseconds, format); else - wsprintf(myformat,"%04d/%02d/%02d %02d:%02d:%02d.%03d UTC : %s - %s\r\n", + wsprintfA(myformat,"%04d/%02d/%02d %02d:%02d:%02d.%03d UTC : %s - %s\r\n", time.wYear, time.wMonth, time.wDay, @@ -106,19 +106,19 @@ format); } else { if (prefix[0] == '\0') - wsprintf( myformat, "%s\r\n", format); + wsprintfA( myformat, "%s\r\n", format); else - wsprintf( myformat, "%s - %s\r\n", prefix, format); + wsprintfA( myformat, "%s - %s\r\n", prefix, format); } result = vsprintf(tst,myformat,params); if (my_debug_output) - OutputDebugString(tst); + OutputDebugStringA(tst); if (my_use_file && (hFile != NULL)) { SetFilePointer( hFile, 0, 0, FILE_END ); DWORD written; - WriteFile( hFile, tst, lstrlen(tst), &written, NULL ); + WriteFile( hFile, tst, lstrlenA(tst), &written, NULL ); } #else if (my_time_included) { @@ -192,7 +192,7 @@ result = false; #ifdef WIN32 - hFile = CreateFile(NewFilename, GENERIC_WRITE, FILE_SHARE_WRITE\|FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + hFile = CreateFileA(NewFilename, GENERIC_WRITE, FILE_SHARE_WRITE\|FILE_SHARE_READ, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); if (hFile != INVALID_HANDLE_VALUE) { SetFilePointer( hFile, 0, 0, FILE_END );
[-] [+]	Changed	libebml-0.7.8.tar.bz2/src/StdIOCallback.cpp ^
@@ -28,7 +28,7 @@ /! \file - \version \$Id: StdIOCallback.cpp 1094 2005-03-16 18:30:28Z robux4 $ + \version \$Id: StdIOCallback.cpp 1298 2008-02-21 22:14:18Z mosu $ \author Steve Lhomme <robux4 @ users.sf.net> \author Moritz Bunkus <moritz @ bunkus.org> / @@ -64,7 +64,7 @@ { assert(Path!=0); - char Mode; + const char Mode; switch (aMode) { case MODE_READ: