Fixed a cast warning with the mDNSResponder fix using the 4.2 compiler.

M mdns.diff

git-svn-id: http://svn.telesphoreo.org/trunk@196 514c082c-b64e-11dc-b46d-3d985efe055d

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index c6a5a86f1bc1a198d7b2f5780d39f761141a7f06..37594e7a69b6890bea57a20ebf698a69a84074bf 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1712,7 +1712,7 @@ int main(int argc,const char *argv[])
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";

    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;
    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;

diff --git a/cmdline/apt-cache.cc.orig b/cmdline/apt-cache.cc.orig
index 13df6216db3723956c823dbcf33f79b0318c68b5..d729170caad50948348771376974155c34b7c0a3 100644 (file)
--- a/cmdline/apt-cache.cc.orig
+++ b/cmdline/apt-cache.cc.orig
@@ -1712,7 +1712,7 @@ int main(int argc,const char *argv[])
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";

    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;
    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;

diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 7d11585cc9160275b6de3d688e69fef247af6685..8f4efeaa444d7f393edcb614c3a9c5aeb0a27e37 100644 (file)
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -173,7 +173,7 @@ int main(int argc,const char *argv[])
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";

    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;
    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;

diff --git a/cmdline/apt-cdrom.cc.orig b/cmdline/apt-cdrom.cc.orig
index 3ce0fd796d94cadda824e87d251da98d9bbc785b..bba416b8cea17fbe84b93b129b8f02a4fbb09b9e 100644 (file)
--- a/cmdline/apt-cdrom.cc.orig
+++ b/cmdline/apt-cdrom.cc.orig
@@ -173,7 +173,7 @@ int main(int argc,const char *argv[])
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";

    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;
    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;

diff --git a/cmdline/apt-config.cc b/cmdline/apt-config.cc
index faf11640c6c1bfdf7c58bcfc5644da7fca6077b3..6241b30c2c6c79b9a1a66ead328b40973f9c6c23 100644 (file)
--- a/cmdline/apt-config.cc
+++ b/cmdline/apt-config.cc
@@ -97,7 +97,7 @@ int main(int argc,const char *argv[])
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";

    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;
    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;

diff --git a/cmdline/apt-config.cc.orig b/cmdline/apt-config.cc.orig
index 0805c8ef1b9ba32ad0884181bcf5487e0d7a79b6..dab395295001fc2d3473fbf4f6daec09554e04c3 100644 (file)
--- a/cmdline/apt-config.cc.orig
+++ b/cmdline/apt-config.cc.orig
@@ -97,7 +97,7 @@ int main(int argc,const char *argv[])
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";

    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;
    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index 70020587354c0d74157981add5f90403ab22bef1..82729b2f00ea5581b7c515c34e776d4cd7bef58a 100644 (file)
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -357,7 +357,7 @@ int main(int argc, const char **argv)
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";

    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;
    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;

diff --git a/cmdline/apt-extracttemplates.cc.orig b/cmdline/apt-extracttemplates.cc.orig
index 2edbfac06874ed775ef87eaf163f3d316fc0a9cf..7aab8237a81d6e7aa9c7ad790681c8f65adf159a 100644 (file)
--- a/cmdline/apt-extracttemplates.cc.orig
+++ b/cmdline/apt-extracttemplates.cc.orig
@@ -357,7 +357,7 @@ int main(int argc, const char **argv)
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";

    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;
    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 8b2788603028b362e79e8f73df6343a48f5b9ab9..6c111736f08abd8482d97932f3c2a925dc0ba5a3 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2510,7 +2510,7 @@ int main(int argc,const char *argv[])
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";

    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;
    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;

diff --git a/cmdline/apt-get.cc.orig b/cmdline/apt-get.cc.orig
index f623710886b3ef566a312201fef54989e4e920cb..dc4bf67e26f23cc400403255d2add864f3eebeaf 100644 (file)
--- a/cmdline/apt-get.cc.orig
+++ b/cmdline/apt-get.cc.orig
@@ -2509,7 +2509,7 @@ int main(int argc,const char *argv[])
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";

    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;
    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;

diff --git a/cmdline/apt-sortpkgs.cc b/cmdline/apt-sortpkgs.cc
index 5424a9ffd18f17e9f8f1d0b6f58957c8e45cdcb8..106f4bf66dd258a5385c5847c5425e100c0eee59 100644 (file)
--- a/cmdline/apt-sortpkgs.cc
+++ b/cmdline/apt-sortpkgs.cc
@@ -170,7 +170,7 @@ int main(unsigned int argc,const char *argv[])
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";

    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;
    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;

diff --git a/cmdline/apt-sortpkgs.cc.orig b/cmdline/apt-sortpkgs.cc.orig
index 4b3bba810832c6e66b713171a8629d5fc6f0ab07..63bb0afde17a51ed2c50b50e0d69798895e701f3 100644 (file)
--- a/cmdline/apt-sortpkgs.cc.orig
+++ b/cmdline/apt-sortpkgs.cc.orig
@@ -170,7 +170,7 @@ int main(unsigned int argc,const char *argv[])
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";

    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;
    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;

diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index 6d5c29d1ff435655d087ff380bb3eae9c3b317f4..a5aaec797ee6da80896698ca4ca94629a9d2c3da 100644 (file)
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -907,7 +907,7 @@ int main(int argc, const char *argv[])
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";

    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;
    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;

diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index 2d6da2150551ac513ef4c0808138a32301b2ee9d..26e3b4ba96846ab07f4cc79a030b53a1c6bb765f 100644 (file)
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -199,7 +199,7 @@ int main()
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";

    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;
    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;

diff --git a/methods/copy.cc b/methods/copy.cc
index 32738537d673129f3df12dd85aecfb57d10785c4..d3799dee3f72bc29d80395f86454bd691c066dcf 100644 (file)
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -92,7 +92,7 @@ int main()
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";

    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;
    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;

diff --git a/methods/file.cc b/methods/file.cc
index 0c903ccdd8d217f49b78db623eb34b7348a27702..9b264c9e4e7f5b30514e225cabfb906e366dd39e 100644 (file)
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -95,7 +95,7 @@ int main()
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";

    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;
    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;

diff --git a/methods/ftp.cc b/methods/ftp.cc
index 9e1333acf9fcfdec260c06a3b1774d7550c145e3..73697d10147e1b64e8023732cd7fa8143f0391f2 100644 (file)
--- a/methods/ftp.cc
+++ b/methods/ftp.cc
@@ -1092,7 +1092,7 @@ int main(int argc,const char *argv[])
 { 
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));
 { 
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";

    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;
    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;

diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index b03d4753cb9990c84fa856d3b5e86a3a1a4af73a..d0081ab78608b4d4adae31e3ab101c4267079033 100644 (file)
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -308,7 +308,7 @@ int main()
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";

    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;
    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;

diff --git a/methods/gzip.cc b/methods/gzip.cc
index 13a7302c2d769b7dc3f3cb3cc5ea0c62f36aa5f4..0128266c3bd388df2112fd8c6dbefb7ddc80ee41 100644 (file)
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -168,7 +168,7 @@ int main(int argc, char *argv[])
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";

    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;
    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;

diff --git a/methods/http.cc b/methods/http.cc
index 4cea76aca3a25afb75960e974af5581cb2529bea..b3cea130a0ce8260d026ff61608e905820447ddf 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -1325,7 +1325,7 @@ int main()
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";

    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;
    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;

diff --git a/methods/rred.cc b/methods/rred.cc
index 3dd939b71988e50c464c08cdaeee42cafe651945..e5fd0ea95e76902a77be61859acd95c18709371b 100644 (file)
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -259,7 +259,7 @@ int main(int argc, char *argv[])
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";

    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;
    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;

diff --git a/methods/rsh.cc b/methods/rsh.cc
index 3e5343ca4665fc5c00b9e1455bfd4bef60da8aaf..1a7475ab816ab8921989669763004bff4511fcfc 100644 (file)
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -517,7 +517,7 @@ int main(int argc, const char *argv[])
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));
 {
    struct nlist nl[2];
    memset(nl, 0, sizeof(nl));

-   nl[0].n_un.n_name = "_useMDNSResponder";
+   nl[0].n_un.n_name = (char *) "_useMDNSResponder";

    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;
    nlist("/usr/lib/libc.dylib", nl);
    if (nl[0].n_type != N_UNDF)
        *(int *) nl[0].n_value = 0;