From: "Lloyd Bryant" <[EMAIL PROTECTED]>
To: [EMAIL PROTECTED], [email protected]
Subject: RE: [Gtk-gnutella-devel] SVN issue: Mismatch bewteen tls_common.c
andtls_common.
Date: Sun, 12 Nov 2006 12:11:24 -0700
From: "Lloyd Bryant" <[EMAIL PROTECTED]>
To: [email protected]
Subject: [Gtk-gnutella-devel] SVN issue: Mismatch bewteen tls_common.c
andtls_common.h
Date: Sun, 12 Nov 2006 07:56:11 -0700
SVN version r12326
Compiling from this version produces the following errors:
tls_common.c:851: error: conflicting types for tls_init
tls_common.h:51: error: previous declaration of tls_init was here
src/core/tls_common.h:51
tls_context_t tls_init(const struct gnutella_socket *s);
src/core/tls_common.c:849
tls_context_t
tls_init(gboolean is_incoming)
Looks like the .c was updated, but not the .h (or vice versa).
Now that's odd. When I grab the SVN to a clean directory, I get a
different version of tls_common.c than I do when I update my existing
directory. But I'm not seeing any "tls_common.c.r...." files in the
original directory, which would normally show up if SVN thought I had
modified "tls_common.c". Not sure what's going on, but it seems to be a
problem with SVN, rather than with the codebase.
This is getting ridiculous... I just deleted "tls_common.c" and ran the
update again. It restored the wrong version (from somewhere on my machine,
I assume).
I'm going to wipe my working directory entirely, and start over. Something
is messed up with subversion on my machine, and I'm not going to waste time
trying to figure it out.
I hate software that outsmarts me. Apologies for wasting bandwidth....
Take three.....
With a fresh copy from the SVN, same error.
I took a closer look at "tls_common.c", at which point I discovered that
there are TWO places where "tls_init" is defined: first, the "real" version,
which is used if the HAS_GNUTLS flag is true, and the second "dummy"
version, which is used if HAS_GNUTLS is false. I had configured GtkG
without TLS support, and so was getting the second version (at line 849),
whose definition does not match the definition in "tls_common.h".
So there is a problem. I was getting lost because I have "vi" set to
remember the line number I was on in a given file - when I looked at the
copy in my working directory, it took me to line 849, while in the "clean"
directory I had to search for "tls_init", which took me to line 288. Since
I don't normally have line numbers enabled, I though I was looking at two
different versions of the same file, rather than two different places in
that file.
Lloyd Bryant
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Gtk-gnutella-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtk-gnutella-devel
