Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (7efea3257739d05650ffd3eb4390865356f1261b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (7efea3257739d05650ffd3eb4390865356f1261b)
  • Date: Sat, 22 Mar 2008 20:03:30 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

audio-libs/libmusicbrainz/HISTORY | 6 +
audio-libs/libmusicbrainz/PRE_BUILD | 3
audio-libs/libmusicbrainz/gcc43.patch | 60 ++++++++++++
ftp-libs/libtorrent/HISTORY | 7 +
ftp-libs/libtorrent/PRE_BUILD | 8 -
ftp-libs/libtorrent/gcc43.patch | 111 ++++++++++++++++++++++++
ftp/rtorrent/HISTORY | 7 +
ftp/rtorrent/PRE_BUILD | 3
ftp/rtorrent/gcc43.patch | 81 +++++++++++++++++
libs/libofx/HISTORY | 5 +
libs/libofx/PRE_BUILD | 4
libs/libofx/gcc43.patch | 157
++++++++++++++++++++++++++++++++++
12 files changed, 444 insertions(+), 8 deletions(-)

New commits:
commit 7efea3257739d05650ffd3eb4390865356f1261b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

rtorrent: Added patch to compile against gcc 4.3.0

commit 0062951ef9e95d6416a1c17ba042bb66263a4d77
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libtorrent: Fix location where I grabbed the patch

commit da6f8e1b7b20a77bca36d9aa6a6451afff309d85
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libtorrent: Added patch to compile with gcc 4.3.0

commit c20ade77e07a7674dec666e572e22dd0449ffd3b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libmusicbrainz: Added patch to build with gcc 4.3.0

commit a94f9ec8cb0ea3f9d105b066f5d0e7970f802073
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

libofx: Added a patch to compile with gcc 4.3.0

diff --git a/audio-libs/libmusicbrainz/HISTORY
b/audio-libs/libmusicbrainz/HISTORY
index 59e591f..80ecb6a 100644
--- a/audio-libs/libmusicbrainz/HISTORY
+++ b/audio-libs/libmusicbrainz/HISTORY
@@ -1,3 +1,8 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Patch to compile against gcc 4.3.0
+ From http://bugs.gentoo.org/show_bug.cgi?id=202472
+
2007-07-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.1.5

@@ -42,3 +47,4 @@

2002-06-12 Unet <unet AT sourcemage.org>
* Created this.
+
diff --git a/audio-libs/libmusicbrainz/PRE_BUILD
b/audio-libs/libmusicbrainz/PRE_BUILD
new file mode 100755
index 0000000..7528467
--- /dev/null
+++ b/audio-libs/libmusicbrainz/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/audio-libs/libmusicbrainz/gcc43.patch
b/audio-libs/libmusicbrainz/gcc43.patch
new file mode 100644
index 0000000..6b626e7
--- /dev/null
+++ b/audio-libs/libmusicbrainz/gcc43.patch
@@ -0,0 +1,60 @@
+#
+# From http://bugs.gentoo.org/show_bug.cgi?id=202472
+#
+diff -Naur libmusicbrainz-2.1.4-orig/lib/c_wrapper.cpp
libmusicbrainz-2.1.4/lib/c_wrapper.cpp
+--- libmusicbrainz-2.1.4-orig/lib/c_wrapper.cpp 2003-10-16
16:21:10.000000000 -0600
++++ libmusicbrainz-2.1.4/lib/c_wrapper.cpp 2007-12-16 09:45:21.000000000
-0600
+@@ -24,6 +24,7 @@
+ #include "musicbrainz.h"
+ #include "trm.h"
+ #include "mb_c.h"
++#include <cstring>
+
+ extern "C"
+ {
+diff -Naur libmusicbrainz-2.1.4-orig/lib/comhttpsocket.cpp
libmusicbrainz-2.1.4/lib/comhttpsocket.cpp
+--- libmusicbrainz-2.1.4-orig/lib/comhttpsocket.cpp 2006-05-11
12:46:54.000000000 -0600
++++ libmusicbrainz-2.1.4/lib/comhttpsocket.cpp 2007-12-16 09:46:28.000000000
-0600
+@@ -20,6 +20,7 @@
+ #endif
+ #include <stdlib.h>
+ #include <assert.h>
++#include <cstring>
+
+ const char* g_strCOMVer = "libmusicbrainz/"VERSION;
+
+diff -Naur libmusicbrainz-2.1.4-orig/lib/comsocket.cpp
libmusicbrainz-2.1.4/lib/comsocket.cpp
+--- libmusicbrainz-2.1.4-orig/lib/comsocket.cpp 2006-05-11
12:46:54.000000000 -0600
++++ libmusicbrainz-2.1.4/lib/comsocket.cpp 2007-12-16 09:46:08.000000000
-0600
+@@ -37,6 +37,7 @@
+ #include <netinet/tcp.h>
+ #include <errno.h>
+ #include <stdio.h>
++#include <cstring>
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+diff -Naur libmusicbrainz-2.1.4-orig/lib/http.cpp
libmusicbrainz-2.1.4/lib/http.cpp
+--- libmusicbrainz-2.1.4-orig/lib/http.cpp 2007-12-16 09:52:48.000000000
-0600
++++ libmusicbrainz-2.1.4/lib/http.cpp 2007-12-16 09:52:36.000000000 -0600
+@@ -31,6 +31,8 @@
+ #endif
+ #include <fcntl.h>
+ #include <errno.h>
++#include <cstring>
++#include <cstdlib>
+
+ #ifdef WIN32
+ #include <winsock.h>
+diff -Naur libmusicbrainz-2.1.4-orig/lib/sigclient.cpp
libmusicbrainz-2.1.4/lib/sigclient.cpp
+--- libmusicbrainz-2.1.4-orig/lib/sigclient.cpp 2006-05-11
12:46:54.000000000 -0600
++++ libmusicbrainz-2.1.4/lib/sigclient.cpp 2007-12-16 09:54:48.000000000
-0600
+@@ -33,6 +33,8 @@
+ #pragma warning(disable:4786)
+ #endif
+
++#include <cstring>
++
+ #include "sigclient.h"
+ #include "comhttpsocket.h"
+
diff --git a/ftp-libs/libtorrent/HISTORY b/ftp-libs/libtorrent/HISTORY
index ed91408..9c731f7 100644
--- a/ftp-libs/libtorrent/HISTORY
+++ b/ftp-libs/libtorrent/HISTORY
@@ -1,6 +1,11 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Upstream patch to fix compilation with gcc 4.3.0
+ From
http://rakshasa.no/pipermail/libtorrent-devel/2008-February/001503.html
+
2008-01-31 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* PRE_BUILD, rm CONFIGURE, dht.diff, PRE_SUB_DEPENDS, and SUB_DEPENDS
- because dht support now built-in.
+ because dht support now built-in.

2008-01-31 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: update to 0.12.0
diff --git a/ftp-libs/libtorrent/PRE_BUILD b/ftp-libs/libtorrent/PRE_BUILD
index 8d44878..302a723 100755
--- a/ftp-libs/libtorrent/PRE_BUILD
+++ b/ftp-libs/libtorrent/PRE_BUILD
@@ -1,5 +1,5 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
# fix problems on amd64 with libtool versions (bug #13943)
-./autogen.sh
-
+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch &&
+./autogen.sh
diff --git a/ftp-libs/libtorrent/gcc43.patch b/ftp-libs/libtorrent/gcc43.patch
new file mode 100644
index 0000000..7d26e29
--- /dev/null
+++ b/ftp-libs/libtorrent/gcc43.patch
@@ -0,0 +1,111 @@
+#
+# From
http://rakshasa.no/pipermail/libtorrent-devel/2008-February/001503.html
+#
+[Libtorrent-devel] fix building with gcc 4.3 and above
+Serge Belyshev belyshev at depni.sinp.msu.ru
+Fri Feb 29 07:30:00 UTC 2008
+
+ * Previous message: [Libtorrent-devel] Total incoming incorrect
+ * Next message: [Libtorrent-devel] fix building rtorrent HEAD without
xmlrpc
+ * Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
+
+In gcc 4.3 header dependencies were cleaned up, so libtorrent/rtorrent
+do not build anymore. Fixed by the following patches, for libtorrent:
+
+Index: libtorrent-0.12.0/rak/functional.h
+===================================================================
+--- libtorrent-0.12.0.orig/rak/functional.h
++++ libtorrent-0.12.0/rak/functional.h
+@@ -37,6 +37,7 @@
+ #ifndef RAK_FUNCTIONAL_H
+ #define RAK_FUNCTIONAL_H
+
++#include <stddef.h>
+ #include <functional>
+
+ namespace rak {
+Index: libtorrent-0.12.0/src/data/chunk.cc
+===================================================================
+--- libtorrent-0.12.0.orig/src/data/chunk.cc
++++ libtorrent-0.12.0/src/data/chunk.cc
+@@ -38,6 +38,7 @@
+
+ #include <algorithm>
+ #include <functional>
++#include <cstring>
+
+ #include "torrent/exceptions.h"
+
+Index: libtorrent-0.12.0/src/data/chunk_list.h
+===================================================================
+--- libtorrent-0.12.0.orig/src/data/chunk_list.h
++++ libtorrent-0.12.0/src/data/chunk_list.h
+@@ -38,6 +38,7 @@
+ #define LIBTORRENT_DATA_CHUNK_LIST_H
+
+ #include <vector>
++#include <string>
+ #include <rak/error_number.h>
+ #include <rak/functional.h>
+
+Index: libtorrent-0.12.0/src/net/address_list.cc
+===================================================================
+--- libtorrent-0.12.0.orig/src/net/address_list.cc
++++ libtorrent-0.12.0/src/net/address_list.cc
+@@ -37,6 +37,7 @@
+ #include "config.h"
+
+ #include <rak/functional.h>
++#include <algorithm>
+
+ #include "download/download_info.h" // for SocketAddressCompact
+
+Index: libtorrent-0.12.0/src/torrent/data/file_list.h
+===================================================================
+--- libtorrent-0.12.0.orig/src/torrent/data/file_list.h
++++ libtorrent-0.12.0/src/torrent/data/file_list.h
+@@ -38,6 +38,7 @@
+ #define LIBTORRENT_FILE_LIST_H
+
+ #include <vector>
++#include <cstdlib>
+ #include <torrent/common.h>
+ #include <torrent/bitfield.h>
+ #include <torrent/path.h>
+Index: libtorrent-0.12.0/src/torrent/exceptions.cc
+===================================================================
+--- libtorrent-0.12.0.orig/src/torrent/exceptions.cc
++++ libtorrent-0.12.0/src/torrent/exceptions.cc
+@@ -37,6 +37,7 @@
+ #include "config.h"
+
+ #include <cerrno>
++#include <cstring>
+
+ #include "exceptions.h"
+
+Index: libtorrent-0.12.0/src/torrent/tracker_list.h
+===================================================================
+--- libtorrent-0.12.0.orig/src/torrent/tracker_list.h
++++ libtorrent-0.12.0/src/torrent/tracker_list.h
+@@ -40,6 +40,7 @@
+ #include <algorithm>
+ #include <vector>
+ #include <torrent/common.h>
++#include <string>
+
+ namespace torrent {
+
+Index: libtorrent-0.12.0/src/utils/diffie_hellman.cc
+===================================================================
+--- libtorrent-0.12.0.orig/src/utils/diffie_hellman.cc
++++ libtorrent-0.12.0/src/utils/diffie_hellman.cc
+@@ -37,6 +37,7 @@
+ #include "config.h"
+
+ #include <string>
++#include <cstring>
+
+ #ifdef USE_OPENSSL
+ #include <openssl/bn.h>
+
diff --git a/ftp/rtorrent/HISTORY b/ftp/rtorrent/HISTORY
index b00379d..40d32a5 100644
--- a/ftp/rtorrent/HISTORY
+++ b/ftp/rtorrent/HISTORY
@@ -1,6 +1,11 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Patch to fix compilation with gcc 4.3.0
+ From
http://rakshasa.no/pipermail/libtorrent-devel/2008-February/001503.html
+
2008-01-31 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DEPENDS, rm CONFIGURE, PRE_BUILD, dht.diff: not needed anymore
- because dht support now built-in
+ because dht support now built-in

2008-01-31 Mathieu Lonjaret <lejatorn AT sourcemage.org>
* DETAILS: update to 0.8.0
diff --git a/ftp/rtorrent/PRE_BUILD b/ftp/rtorrent/PRE_BUILD
new file mode 100755
index 0000000..7528467
--- /dev/null
+++ b/ftp/rtorrent/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
diff --git a/ftp/rtorrent/gcc43.patch b/ftp/rtorrent/gcc43.patch
new file mode 100644
index 0000000..17eeee6
--- /dev/null
+++ b/ftp/rtorrent/gcc43.patch
@@ -0,0 +1,81 @@
+#
+# From
http://rakshasa.no/pipermail/libtorrent-devel/2008-February/001503.html
+#
+[Libtorrent-devel] fix building with gcc 4.3 and above
+Serge Belyshev belyshev at depni.sinp.msu.ru
+Fri Feb 29 07:30:00 UTC 2008
+
+ * Previous message: [Libtorrent-devel] Total incoming incorrect
+ * Next message: [Libtorrent-devel] fix building rtorrent HEAD without
xmlrpc
+ * Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
+
+In gcc 4.3 header dependencies were cleaned up, so libtorrent/rtorrent
+do not build anymore. Fixed by the following patches, for libtorrent:
+
+Index: rtorrent-0.8.0/rak/functional.h
+===================================================================
+--- rtorrent-0.8.0.orig/rak/functional.h
++++ rtorrent-0.8.0/rak/functional.h
+@@ -37,6 +37,7 @@
+ #ifndef RAK_FUNCTIONAL_H
+ #define RAK_FUNCTIONAL_H
+
++#include <stddef.h>
+ #include <functional>
+
+ namespace rak {
+Index: rtorrent-0.8.0/src/command_ui.cc
+===================================================================
+--- rtorrent-0.8.0.orig/src/command_ui.cc
++++ rtorrent-0.8.0/src/command_ui.cc
+@@ -39,6 +39,7 @@
+ #include <rak/functional.h>
+ #include <rak/functional_fun.h>
+ #include <sigc++/adaptors/bind.h>
++#include <ctime>
+
+ #include "core/manager.h"
+ #include "core/view_manager.h"
+Index: rtorrent-0.8.0/src/display/text_element_value.cc
+===================================================================
+--- rtorrent-0.8.0.orig/src/display/text_element_value.cc
++++ rtorrent-0.8.0/src/display/text_element_value.cc
+@@ -38,6 +38,7 @@
+
+ #include "globals.h"
+ #include "text_element_value.h"
++#include <ctime>
+
+ namespace display {
+
+Index: rtorrent-0.8.0/src/rpc/exec_file.cc
+===================================================================
+--- rtorrent-0.8.0.orig/src/rpc/exec_file.cc
++++ rtorrent-0.8.0/src/rpc/exec_file.cc
+@@ -37,6 +37,7 @@
+ #include "config.h"
+
+ #include <string>
++#include <cstring>
+ #include <unistd.h>
+ #include <rak/path.h>
+ #include <sys/types.h>
+Index: rtorrent-0.8.0/src/rpc/parse.cc
+===================================================================
+--- rtorrent-0.8.0.orig/src/rpc/parse.cc
++++ rtorrent-0.8.0/src/rpc/parse.cc
+@@ -39,6 +39,7 @@
+ #include <locale>
+ #include <rak/path.h>
+ #include <torrent/exceptions.h>
++#include <cstring>
+
+ #include "parse.h"
+
+
+ * Previous message: [Libtorrent-devel] Total incoming incorrect
+ * Next message: [Libtorrent-devel] fix building rtorrent HEAD without
xmlrpc
+ * Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
+
+More information about the Libtorrent-devel mailing list
+
diff --git a/libs/libofx/HISTORY b/libs/libofx/HISTORY
index c4c1d48..e858986 100644
--- a/libs/libofx/HISTORY
+++ b/libs/libofx/HISTORY
@@ -1,3 +1,7 @@
+2008-03-22 Eric Sandall <sandalle AT sourcemage.org>
+ * gcc43.patch: Added a modified patch to build with gcc 4.3.0
+ From
http://lists4.opensuse.org/opensuse-commit/2007-11/msg00393.html
+
2007-01-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.8.3

@@ -53,3 +57,4 @@

2003-03-02 Jose Bernardo Silva <josebernardo1 AT yahoo.com>
* First go at this one... :-)
+
diff --git a/libs/libofx/PRE_BUILD b/libs/libofx/PRE_BUILD
index 29f3c16..4b85747 100755
--- a/libs/libofx/PRE_BUILD
+++ b/libs/libofx/PRE_BUILD
@@ -3,6 +3,6 @@ cd $SOURCE_DIRECTORY &&

if [ "${LIBOFX_CVS}" == "y" ]; then
NOCONFIGURE="ON" ./autogen.sh
-#else
-# patch -p0 < $SCRIPT_DIRECTORY/explicit-qualification.patch
+else
+ patch -p1 < $SCRIPT_DIRECTORY/gcc43.patch
fi
diff --git a/libs/libofx/gcc43.patch b/libs/libofx/gcc43.patch
new file mode 100644
index 0000000..2b7bf2e
--- /dev/null
+++ b/libs/libofx/gcc43.patch
@@ -0,0 +1,157 @@
+#
+# Modfied from
http://lists4.opensuse.org/opensuse-commit/2007-11/msg00393.html
+#
+diff -Naur libofx-0.8.3.orig/lib/context.hh libofx-0.8.3/lib/context.hh
+--- libofx-0.8.3.orig/lib/context.hh 2008-03-22 16:46:56.140089316 -0700
++++ libofx-0.8.3/lib/context.hh 2008-03-22 16:50:19.762089412 -0700
+@@ -13,8 +13,9 @@
+
+ #ifndef CONTEXT_H
+ #define CONTEXT_H
+-#include <string.h>
+-#include <time.h> // for time_t
++#include <string>
++#include <cstring>
++#include <ctime> // for time_t
+ #include "libofx.h"
+ #include "ParserEventGeneratorKit.h"
+
+diff -Naur libofx-0.8.3.orig/lib/getopt.c libofx-0.8.3/lib/getopt.c
+--- libofx-0.8.3.orig/lib/getopt.c 2008-03-22 16:46:56.138090763 -0700
++++ libofx-0.8.3/lib/getopt.c 2008-03-22 16:51:35.755087850 -0700
+@@ -39,7 +39,8 @@
+ # endif
+ #endif
+
+-#include <stdio.h>
++#include <cstdio>
++#include <cstlib>
+
+ /* Comment out all this code if we are using the GNU C Library, and are not
+ actually compiling the library itself. This code is part of the GNU C
+@@ -65,14 +66,14 @@
+ #ifdef __GNU_LIBRARY__
+ /* Don't include stdlib.h for non-GNU C libraries because some of them
+ contain conflicting prototypes for getopt. */
+-# include <stdlib.h>
++# include <cstdlib>
+ # include <unistd.h>
+ #endif /* GNU C library. */
+
+ #ifdef VMS
+ # include <unixlib.h>
+ # if HAVE_STRING_H - 0
+-# include <string.h>
++# include <cstring>
+ # endif
+ #endif
+
+diff -Naur libofx-0.8.3.orig/lib/ofx_container_transaction.cpp
libofx-0.8.3/lib/ofx_container_transaction.cpp
+--- libofx-0.8.3.orig/lib/ofx_container_transaction.cpp 2008-03-22
16:46:56.137089391 -0700
++++ libofx-0.8.3/lib/ofx_container_transaction.cpp 2008-03-22
16:51:55.572087807 -0700
+@@ -22,6 +22,7 @@
+ #endif
+
+ #include <string>
++#include <cstdlib>
+ #include "messages.hh"
+ #include "libofx.h"
+ #include "ofx_containers.hh"
+diff -Naur libofx-0.8.3.orig/lib/ofx_request_accountinfo.cpp
libofx-0.8.3/lib/ofx_request_accountinfo.cpp
+--- libofx-0.8.3.orig/lib/ofx_request_accountinfo.cpp 2008-03-22
16:46:56.137089391 -0700
++++ libofx-0.8.3/lib/ofx_request_accountinfo.cpp 2008-03-22
16:52:57.719088277 -0700
+@@ -22,6 +22,7 @@
+ #endif
+
+ #include <string>
++#include <cstdlib>
+ #include "libofx.h"
+ #include "ofx_request_accountinfo.hh"
+
+diff -Naur libofx-0.8.3.orig/lib/ofx_request.cpp
libofx-0.8.3/lib/ofx_request.cpp
+--- libofx-0.8.3.orig/lib/ofx_request.cpp 2008-03-22 16:46:56.137089391
-0700
++++ libofx-0.8.3/lib/ofx_request.cpp 2008-03-22 16:52:45.584088317 -0700
+@@ -21,6 +21,7 @@
+ #include <config.h>
+ #endif
+
++#include <cstring>
+ #include <string>
+ #include "messages.hh"
+ #include "libofx.h"
+diff -Naur libofx-0.8.3.orig/lib/ofx_request_statement.cpp
libofx-0.8.3/lib/ofx_request_statement.cpp
+--- libofx-0.8.3.orig/lib/ofx_request_statement.cpp 2008-03-22
16:46:56.137089391 -0700
++++ libofx-0.8.3/lib/ofx_request_statement.cpp 2008-03-22 16:53:23.258088668
-0700
+@@ -22,6 +22,8 @@
+ #endif
+
+ #include <string>
++#include <cstring>
++#include <cstdlib>
+ #include "libofx.h"
+ #include "ofx_utilities.hh"
+ #include "ofx_request_statement.hh"
+diff -Naur libofx-0.8.3.orig/lib/ofx_utilities.cpp
libofx-0.8.3/lib/ofx_utilities.cpp
+--- libofx-0.8.3.orig/lib/ofx_utilities.cpp 2008-03-22 16:46:56.138090763
-0700
++++ libofx-0.8.3/lib/ofx_utilities.cpp 2008-03-22 16:54:01.984088246 -0700
+@@ -19,9 +19,11 @@
+ #include <iostream>
+ #include "ParserEventGeneratorKit.h"
+ #include "SGMLApplication.h"
+-#include <time.h>
++#include <ctime>
+ #include <string>
+-#include <locale.h>
++#include <cstring>
++#include <clocale>
++#include <cstdlib>
+ #include "messages.hh"
+ #include "ofx_utilities.hh"
+
+diff -Naur libofx-0.8.3.orig/lib/ofx_utilities.hh
libofx-0.8.3/lib/ofx_utilities.hh
+--- libofx-0.8.3.orig/lib/ofx_utilities.hh 2008-03-22 16:46:56.140089316
-0700
++++ libofx-0.8.3/lib/ofx_utilities.hh 2008-03-22 16:54:20.736087907 -0700
+@@ -17,8 +17,9 @@
+
***************************************************************************/
+ #ifndef OFX_UTIL_H
+ #define OFX_UTIL_H
+-#include <string.h>
+-#include <time.h> // for time_t
++#include <string>
++#include <cstring>
++#include <ctime> // for time_t
+ #include "ParserEventGeneratorKit.h"
+ using namespace std;
+ /* This file contains various simple functions for type conversion & al */
+diff -Naur libofx-0.8.3.orig/ofxconnect/cmdline.c
libofx-0.8.3/ofxconnect/cmdline.c
+--- libofx-0.8.3.orig/ofxconnect/cmdline.c 2008-03-22 16:46:56.063088460
-0700
++++ libofx-0.8.3/ofxconnect/cmdline.c 2008-03-22 16:54:41.572088480 -0700
+@@ -9,9 +9,9 @@
+ */
+
+
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
++#include <cstdio>
++#include <cstdlib>
++#include <cstring>
+
+ /* If we use autoconf. */
+ #ifdef HAVE_CONFIG_H
+diff -Naur libofx-0.8.3.orig/ofxdump/ofxdump.cpp
libofx-0.8.3/ofxdump/ofxdump.cpp
+--- libofx-0.8.3.orig/ofxdump/ofxdump.cpp 2008-03-22 16:46:56.063088460
-0700
++++ libofx-0.8.3/ofxdump/ofxdump.cpp 2008-03-22 16:55:19.420088363 -0700
+@@ -30,8 +30,11 @@
+ #include <iostream>
+ #include <iomanip>
+ #include <string>
++#include <cstdio>
++#include <cstdlib>
++#include <cstring>
+ #include "libofx.h"
+-#include <stdio.h> /* for printf() */
++#include <cstdio> /* for printf() */
+ #include <config.h> /* Include config constants, e.g., VERSION TF
*/
+ #include <errno.h>
+



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (7efea3257739d05650ffd3eb4390865356f1261b), Eric Sandall, 03/22/2008

Archive powered by MHonArc 2.6.24.

Top of Page