[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: 332-gary-g++-compatibility
From: |
Gary V. Vaughan |
Subject: |
FYI: 332-gary-g++-compatibility |
Date: |
Sun, 24 Jun 2007 15:05:50 -0400 (EDT) |
User-agent: |
mailnotify/0.9 |
Applied to HEAD.
Index: ChangeLog
from Gary V. Vaughan <address@hidden>
Reenable compilation of libltdl with C++:
* libltdl/ltdl.c (tryall_dlopen): Rename the try variable to
attempt, and cast explicitly.
(advise_dup): Add explicit cast.
Index: libltdl/ltdl.c
===================================================================
RCS file: /sources/libtool/libtool/libltdl/ltdl.c,v
retrieving revision 1.249
diff -u -u -r1.249 ltdl.c
--- libltdl/ltdl.c 8 May 2007 14:38:50 -0000 1.249
+++ libltdl/ltdl.c 24 Jun 2007 19:05:09 -0000
@@ -399,7 +399,7 @@
lt__advise *advise_taken = 0;
if (advise)
- advise_taken = advise_dup (advise);
+ advise_taken = advise_dup ((lt__advise *) advise);
vtable = lt_dlloader_get (loader);
handle->module = (*vtable->module_open) (vtable->dlloader_data,
@@ -1100,7 +1100,7 @@
char * base_name = 0;
char * dir = 0;
char * name = 0;
- char * try = 0;
+ char * attempt = 0;
int errors = 0;
lt_dlhandle newhandle;
@@ -1134,22 +1134,22 @@
if (ext)
{
- try = MALLOC (char, LT_STRLEN (filename) + LT_STRLEN (ext) + 1);
- if (!try)
+ attempt = MALLOC (char, LT_STRLEN (filename) + LT_STRLEN (ext) + 1);
+ if (!attempt)
return 1;
- sprintf(try, "%s%s", filename, ext);
+ sprintf(attempt, "%s%s", filename, ext);
}
else
{
- try = lt__strdup (filename);
- if (!try)
+ attempt = lt__strdup (filename);
+ if (!attempt)
return 1;
}
/* Doing this immediately allows internal functions to safely
assume only canonicalized paths are passed. */
- if (canonicalize_path (try, &canonical) != 0)
+ if (canonicalize_path (attempt, &canonical) != 0)
{
++errors;
goto cleanup;
@@ -1390,7 +1390,7 @@
cleanup:
FREE (dir);
- FREE (try);
+ FREE (attempt);
FREE (name);
if (!canonical) /* was MEMREASSIGNed */
FREE (base_name);
@@ -1495,7 +1495,7 @@
advise_dup (lt__advise *advise)
{
lt__advise *dup = (lt__advise *) lt__zalloc (sizeof (lt__advise));
- return memcpy (dup, advise, sizeof (lt__advise));
+ return (lt__advise *) memcpy (dup, advise, sizeof (lt__advise));
}
/* Libtool-1.5.x interface for loading a new module named FILENAME. */
--
())_. Email me: address@hidden
( '/ Read my blog: http://blog.azazil.net
/ )= ...and my book: http://sources.redhat.com/autobook
`(_~)_ Join my AGLOCO Network: http://www.agloco.com/r/BBBS7912
_________________________________________________________
This patch notification generated by vcsapply version 1.0
http://savannah.gnu.org/projects/cvs-utils
pgpyU47wfmmFS.pgp
Description: PGP signature
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: 332-gary-g++-compatibility,
Gary V. Vaughan <=