[Gtkradiant] CVS: Kinda hacky, but on Mac OS X / Darwin multiple definition of the zlib...

Shawn Walker,,, gtkradiant@zerowing.idsoftware.com
Wed, 13 Nov 2002 18:39:20 -0600


This is a mixed plain/HTML MIME encoded message.

--103723436019509
Content-Type: text/plain

User   : eviltypeguy
Branch : Stable-1_2-Apple
Root   : zerowing:/cvs
Date   : 2002/11/13  18:36:29

Kinda hacky, but on Mac OS X / Darwin multiple definition of the zlib
functions that are already provided by the local system is considered
Evil and Wrong(TM) and ld spews tons of warnings over it. This cleans
it up so that ONLY on the __APPLE__ platform the functions here are
not defined so that the local zlib ones are used instead.

In the future we should consider just using straight zlib instead of
this mess anyway. But for now this should allow a Stable branch merge
without breaking any of the other supported platforms.

--

1 files modified :

  GtkRadiant/tools/quake3/common/unzip.c
    1.3.12.1 : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/tools/quake3/common/unzip.c?rev=1.3.12.1
    1.3 : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/tools/quake3/common/unzip.c?rev=1.3
    diff : http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/tools/quake3/common/unzip.c.diff?r1=1.3&r2=1.3.12.1


--103723436019509
Content-Type: text/html

<html>
<head><title>CVS report</title></head>
<body bgcolor="#ffffff" text="#000000">

<table border=0 width="100%" cellspacing=0 cellpadding=0>
 <tr>
<td align=left><b>Commit from <i>eviltypeguy</i> on branch <i>Stable-1_2-Apple</i></b></td>
  <td align=right valign=bottom>2002/11/13  &nbsp; 18:36:29</td>
 </tr>
</table>
<hr width="100%" size=2 noshade><br>

<code>
Kinda hacky, but on Mac OS X / Darwin multiple definition of the zlib<br>functions that are already provided by the local system is considered<br>Evil and Wrong(TM) and ld spews tons of warnings over it. This cleans<br>it up so that ONLY on the __APPLE__ platform the functions here are<br>not defined so that the local zlib ones are used instead.<br><br>In the future we should consider just using straight zlib instead of<br>this mess anyway. But for now this should allow a Stable branch merge<br>without breaking any of the other supported platforms.<br>
</code>
<hr width="100%" size=2 noshade><br>
<code>
<table border=0 width="100%">

 <tr>
  <td colspan=5>&nbsp;</td>
 </tr>
 <tr bgcolor="#e0e0e0">
  <td colspan=5 align=center><b>1 file modified</b></td>
 </tr>
 <tr>
  <td><b>Module</b></td>
  <td><b>File name</b></td>
  <td colspan=3><b>Version</b></td>
 </tr>
 <tr>
  <td><b>GtkRadiant</b></td>
  <td><code>tools/quake3/common/unzip.c</code></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/tools/quake3/common/unzip.c?rev=1.3">1.3</a></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/tools/quake3/common/unzip.c.diff?r1=text&tr1=1.3&r2=text&tr2=1.3.12.1&f=h">&gt;&gt;&gt;</a></td>
  <td><a href="http://zerowing.idsoftware.com/viewcvs/viewcvs.cgi/GtkRadiant/tools/quake3/common/unzip.c?rev=1.3.12.1">1.3.12.1</a></td>
 </tr>

</table>

</body>
</html>

--103723436019509--