You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by bi...@apache.org on 2009/01/05 02:45:12 UTC
svn commit: r731405 -
/commons/proper/daemon/trunk/src/native/unix/native/dso.h
Author: billbarker
Date: Sun Jan 4 17:45:12 2009
New Revision: 731405
URL: http://svn.apache.org/viewvc?rev=731405&view=rev
Log:
Only include Mac-specific files if compiling for Mac.
Still don't know what I'm doing, but trusting that I have enough testers to tell me. At least this should fix the Gump build.
Modified:
commons/proper/daemon/trunk/src/native/unix/native/dso.h
Modified: commons/proper/daemon/trunk/src/native/unix/native/dso.h
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/native/dso.h?rev=731405&r1=731404&r2=731405&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/native/dso.h (original)
+++ commons/proper/daemon/trunk/src/native/unix/native/dso.h Sun Jan 4 17:45:12 2009
@@ -20,7 +20,7 @@
/**
* A library handle represents a unique pointer to its location in memory.
*/
-#ifdef DSO_DLFCN
+#ifdef OS_DARWIN
#include <mach-o/dyld.h>
#endif
typedef void *dso_handle;
Re: svn commit: r731405 - /commons/proper/daemon/trunk/src/native/unix/native/dso.h
Posted by Mark Thomas <ma...@apache.org>.
Bill Barker wrote:
> "Mark Thomas" <ma...@apache.org> wrote in message
> news:4961BDA4.4070106@apache.org...
>> billbarker@apache.org wrote:
>>> Author: billbarker
>>> Date: Sun Jan 4 17:45:12 2009
>>> New Revision: 731405
>>>
>>> URL: http://svn.apache.org/viewvc?rev=731405&view=rev
>>> Log:
>>> Only include Mac-specific files if compiling for Mac.
>>>
>>> Still don't know what I'm doing, but trusting that I have enough testers
>>> to tell me. At least this should fix the Gump build.
>> It looks like the original patch you applied wasn't quite the same as
>> the one provided with DAEMON-98. I have been testing on linux and mac
>> and I have set of changes that works for both (at least Mac 10.5
>> anyway). I'll commit them just as soon as my new karma gets applied to
>> svn.
>>
>
> Welcome to commons :).
Cheers.
> The problem with DAEMON-98 is that the patches are a bit inconsistent. It's
> not clear when the .m4 should be defining DSO_DYLD or DSO_DLFCN. It is
> likely a version check, but I wouldn't know how to do it, or what the check
> should be.
My guess was it might be required for the 10.4.x build. If it is, I'll
need to re-work the patch once I figure out how to distinguish between
10.5 and 10.4 - I'll cross that bridge if and when I come to it.
Hopefully it won't be required and I can delete it :)
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r731405 - /commons/proper/daemon/trunk/src/native/unix/native/dso.h
Posted by Bill Barker <wb...@wilshire.com>.
"Mark Thomas" <ma...@apache.org> wrote in message
news:4961BDA4.4070106@apache.org...
> billbarker@apache.org wrote:
>> Author: billbarker
>> Date: Sun Jan 4 17:45:12 2009
>> New Revision: 731405
>>
>> URL: http://svn.apache.org/viewvc?rev=731405&view=rev
>> Log:
>> Only include Mac-specific files if compiling for Mac.
>>
>> Still don't know what I'm doing, but trusting that I have enough testers
>> to tell me. At least this should fix the Gump build.
>
> It looks like the original patch you applied wasn't quite the same as
> the one provided with DAEMON-98. I have been testing on linux and mac
> and I have set of changes that works for both (at least Mac 10.5
> anyway). I'll commit them just as soon as my new karma gets applied to
> svn.
>
Welcome to commons :).
The problem with DAEMON-98 is that the patches are a bit inconsistent. It's
not clear when the .m4 should be defining DSO_DYLD or DSO_DLFCN. It is
likely a version check, but I wouldn't know how to do it, or what the check
should be.
I think that JFC at least used to have a Mac. You might try pinging him if
you need help on this. Otherwise, there is very little useful that I can do
for DAEMON-98, so leaving it in your hands.
> Mark
>
>>
>> Modified:
>> commons/proper/daemon/trunk/src/native/unix/native/dso.h
>>
>> Modified: commons/proper/daemon/trunk/src/native/unix/native/dso.h
>> URL:
>> http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/native/dso.h?rev=731405&r1=731404&r2=731405&view=diff
>> ==============================================================================
>> --- commons/proper/daemon/trunk/src/native/unix/native/dso.h (original)
>> +++ commons/proper/daemon/trunk/src/native/unix/native/dso.h Sun Jan 4
>> 17:45:12 2009
>> @@ -20,7 +20,7 @@
>> /**
>> * A library handle represents a unique pointer to its location in
>> memory.
>> */
>> -#ifdef DSO_DLFCN
>> +#ifdef OS_DARWIN
>> #include <mach-o/dyld.h>
>> #endif
>> typedef void *dso_handle;
>>
>>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r731405 - /commons/proper/daemon/trunk/src/native/unix/native/dso.h
Posted by Mark Thomas <ma...@apache.org>.
billbarker@apache.org wrote:
> Author: billbarker
> Date: Sun Jan 4 17:45:12 2009
> New Revision: 731405
>
> URL: http://svn.apache.org/viewvc?rev=731405&view=rev
> Log:
> Only include Mac-specific files if compiling for Mac.
>
> Still don't know what I'm doing, but trusting that I have enough testers to tell me. At least this should fix the Gump build.
It looks like the original patch you applied wasn't quite the same as
the one provided with DAEMON-98. I have been testing on linux and mac
and I have set of changes that works for both (at least Mac 10.5
anyway). I'll commit them just as soon as my new karma gets applied to svn.
Mark
>
> Modified:
> commons/proper/daemon/trunk/src/native/unix/native/dso.h
>
> Modified: commons/proper/daemon/trunk/src/native/unix/native/dso.h
> URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/native/dso.h?rev=731405&r1=731404&r2=731405&view=diff
> ==============================================================================
> --- commons/proper/daemon/trunk/src/native/unix/native/dso.h (original)
> +++ commons/proper/daemon/trunk/src/native/unix/native/dso.h Sun Jan 4 17:45:12 2009
> @@ -20,7 +20,7 @@
> /**
> * A library handle represents a unique pointer to its location in memory.
> */
> -#ifdef DSO_DLFCN
> +#ifdef OS_DARWIN
> #include <mach-o/dyld.h>
> #endif
> typedef void *dso_handle;
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org