mesa.git
19 years agoRemove the VIA_PERFORMANCE code. A step towards moving the driver
Keith Whitwell [Thu, 23 Dec 2004 18:26:40 +0000 (18:26 +0000)]
Remove the VIA_PERFORMANCE code.  A step towards moving the driver
back to using the shared template files.

19 years agoChop out more dead code.
Keith Whitwell [Thu, 23 Dec 2004 18:16:22 +0000 (18:16 +0000)]
Chop out more dead code.
Get the drawXoff adjustment working a bit better.
Seems to pass the glean orthoPos tests.

19 years agoFix merge error.
Keith Whitwell [Wed, 22 Dec 2004 19:31:10 +0000 (19:31 +0000)]
Fix merge error.

19 years agoRemove dead code.
Keith Whitwell [Wed, 22 Dec 2004 19:30:02 +0000 (19:30 +0000)]
Remove dead code.
Fix 24/8 depth/stencil visuals.

19 years agoEnabled hardware rendering of 1D textures. No need for a software fallback.
Felix Kuehling [Wed, 22 Dec 2004 16:12:59 +0000 (16:12 +0000)]
Enabled hardware rendering of 1D textures. No need for a software fallback.

19 years ago- Fake projective textures on a single texture unit. A fallback is only
Felix Kuehling [Wed, 22 Dec 2004 00:21:32 +0000 (00:21 +0000)]
- Fake projective textures on a single texture unit. A fallback is only
  needed if a second texture unit is enabled.
- Also worked around an application bug in Chromium B.S.U.: it sends 3D
  texture coordinates while only a 2D texture is enabled. This used to
  trigger a PTEX fallback. Now the 3rd coordinate is just ignored.
- Fixed the _savage_texnorm_stage to never normalize homogenous texture
  coordinates.

19 years agoRemove debug code which referenced an old global variable.
Keith Whitwell [Tue, 21 Dec 2004 23:07:13 +0000 (23:07 +0000)]
Remove debug code which referenced an old global variable.

19 years agoUsed GCC's __builtin_expect when available. Change the way code is
Ian Romanick [Tue, 21 Dec 2004 23:06:02 +0000 (23:06 +0000)]
Used GCC's __builtin_expect when available.  Change the way code is
generated for commands that can use RenderLarge packets.  Tweak the code for
__glXFlushRenderBuffer slightly.

19 years agoPush a number of global variables into the viaContext struct.
Keith Whitwell [Tue, 21 Dec 2004 22:42:00 +0000 (22:42 +0000)]
Push a number of global variables into the viaContext struct.
Remove the bogus 'current_vmesa' pointer.

19 years agoAdded some comments and fixed typeos. Slightly refactored the way
Ian Romanick [Tue, 21 Dec 2004 21:26:36 +0000 (21:26 +0000)]
Added some comments and fixed typeos.  Slightly refactored the way
function parameters are iterated.  There are no changes in the generated
code.

19 years ago`t' was not initialized (use `texture' instead?)
Daniel Borca [Tue, 21 Dec 2004 15:45:41 +0000 (15:45 +0000)]
`t' was not initialized (use `texture' instead?)

19 years agofix bug in _mesa_IsTexture()
Brian Paul [Tue, 21 Dec 2004 15:13:41 +0000 (15:13 +0000)]
fix bug in _mesa_IsTexture()

19 years agoNote that state is dirty on contended lock. Allows two applications
Keith Whitwell [Tue, 21 Dec 2004 13:23:10 +0000 (13:23 +0000)]
Note that state is dirty on contended lock.  Allows two applications
to run together correctly, though scheduling between them still isn't
great.

19 years agoAdd missing swap-control calculations.
Keith Whitwell [Tue, 21 Dec 2004 12:35:04 +0000 (12:35 +0000)]
Add missing swap-control calculations.
Remove debug printf.

19 years agoAdd vsync swapbuffers. This waits on the irq so gears run in this mode
Keith Whitwell [Tue, 21 Dec 2004 11:57:03 +0000 (11:57 +0000)]
Add vsync swapbuffers.  This waits on the irq so gears run in this mode
will have a very low cpu utilization (and also a very low framerate).

Fix up the pageflipping code.  This works now but is totally oblivious
to the X server (ie. it works but it's broken).  Turned off by a #define.

19 years agoadded GL_EXT_stencil_two_side (yes, it works)
Daniel Borca [Tue, 21 Dec 2004 08:21:52 +0000 (08:21 +0000)]
added GL_EXT_stencil_two_side (yes, it works)

19 years agomissing `or' in preprocessor conditional
Daniel Borca [Tue, 21 Dec 2004 08:05:43 +0000 (08:05 +0000)]
missing `or' in preprocessor conditional

19 years agoAdd a -fullscreen option
Keith Whitwell [Mon, 20 Dec 2004 14:48:19 +0000 (14:48 +0000)]
Add a -fullscreen option

19 years agoRemove #ifdef DEBUG's in code, but still allow compiler to remove debug
Keith Whitwell [Mon, 20 Dec 2004 12:52:21 +0000 (12:52 +0000)]
Remove #ifdef DEBUG's in code, but still allow compiler to remove debug
code if DEBUG not defined.

19 years agoput back clipmask code; it proved to be a MinGW/gcc 3.3.x error in t_vb_cliptmp.h...
Daniel Borca [Mon, 20 Dec 2004 08:24:10 +0000 (08:24 +0000)]
put back clipmask code; it proved to be a MinGW/gcc 3.3.x error in t_vb_cliptmp.h(47), where it would still send clipped vertices to the hw... oh, dear...

19 years agouse float constants.
Daniel Borca [Mon, 20 Dec 2004 08:20:39 +0000 (08:20 +0000)]
use float constants.
fixed a small debug error.

19 years agoremoved ifdef'ed out code (to whom it may concern: it can be found in dri/tdfx driver)
Daniel Borca [Mon, 20 Dec 2004 08:19:28 +0000 (08:19 +0000)]
removed ifdef'ed out code (to whom it may concern: it can be found in dri/tdfx driver)

19 years agoremoved detritus (ncc).
Daniel Borca [Mon, 20 Dec 2004 08:18:19 +0000 (08:18 +0000)]
removed detritus (ncc).

19 years agocomment reorg.
Daniel Borca [Mon, 20 Dec 2004 08:17:36 +0000 (08:17 +0000)]
comment reorg.
removed detritus (ncc).

19 years agomade some functions static.
Daniel Borca [Mon, 20 Dec 2004 08:16:24 +0000 (08:16 +0000)]
made some functions static.

19 years agocomment reorg.
Daniel Borca [Mon, 20 Dec 2004 08:15:50 +0000 (08:15 +0000)]
comment reorg.
made some functions static.
hide vp behind an envvar.
removed unnecessary multitex constraint for napalm hw.

19 years agoallow greater swappendingcount for older hw (v1/v2)
Daniel Borca [Mon, 20 Dec 2004 08:12:09 +0000 (08:12 +0000)]
allow greater swappendingcount for older hw (v1/v2)

19 years agomisc cleanup
Daniel Borca [Mon, 20 Dec 2004 08:09:25 +0000 (08:09 +0000)]
misc cleanup

19 years agoallow ARB vp/fp query program errors
Daniel Borca [Mon, 20 Dec 2004 08:08:15 +0000 (08:08 +0000)]
allow ARB vp/fp query program errors

19 years agoreally protect against npot compressed textures (logbase2 never returns -1).
Daniel Borca [Mon, 20 Dec 2004 08:03:01 +0000 (08:03 +0000)]
really protect against npot compressed textures (logbase2 never returns -1).

19 years agoUse GLX protocol code generated by glX_proto_send.py.
Ian Romanick [Mon, 20 Dec 2004 04:53:00 +0000 (04:53 +0000)]
Use GLX protocol code generated by glX_proto_send.py.

19 years agoNo GLX protocol for GL_ATI_fragment_shader.
Ian Romanick [Mon, 20 Dec 2004 04:47:46 +0000 (04:47 +0000)]
No GLX protocol for GL_ATI_fragment_shader.

19 years agoFix cut and paste error (reported by Jerome Glisse)
Vladimir Dergachev [Sun, 19 Dec 2004 15:39:40 +0000 (15:39 +0000)]
Fix cut and paste error (reported by Jerome Glisse)

19 years agoImplement software ATI_fragment_shader
Dave Airlie [Sun, 19 Dec 2004 03:06:59 +0000 (03:06 +0000)]
Implement software ATI_fragment_shader

no error detection, slow, may not be 100% correct but a good start

19 years agoConsolidate _swrast_write_texture_span() into _swrast_write_rgba_span().
Brian Paul [Sat, 18 Dec 2004 22:03:07 +0000 (22:03 +0000)]
Consolidate _swrast_write_texture_span() into _swrast_write_rgba_span().

19 years agoadded GL_ARB_pixel_buffer_object extension string
Brian Paul [Sat, 18 Dec 2004 16:19:08 +0000 (16:19 +0000)]
added GL_ARB_pixel_buffer_object extension string

19 years agoAdded PRINT instruction for GL_NV_fragment_program.
Brian Paul [Sat, 18 Dec 2004 16:18:00 +0000 (16:18 +0000)]
Added PRINT instruction for GL_NV_fragment_program.

19 years agoUnichrome DRI driver:
Thomas Hellström [Sat, 18 Dec 2004 12:16:12 +0000 (12:16 +0000)]
Unichrome DRI driver:
Fix for proplem where polygons partly outside the drawing window would get
one vertex clamped to the opposite window side. This bug could also cause
a hardlock. (Bugzilla #2066, Yann Vernier)

19 years agoMade debugging output controllable via environment variable
Felix Kuehling [Fri, 17 Dec 2004 15:55:17 +0000 (15:55 +0000)]
Made debugging output controllable via environment variable
SAVAGE_DEBUG. Added fallback debugs. Added no_rast option to disable
hardware rasterization (everything as software fallback).

19 years agoVMS update
Brian Paul [Fri, 17 Dec 2004 14:48:00 +0000 (14:48 +0000)]
VMS update

19 years agofxRasterPrimitive wasn't always receiving the reduced primitive
Daniel Borca [Fri, 17 Dec 2004 10:40:32 +0000 (10:40 +0000)]
fxRasterPrimitive wasn't always receiving the reduced primitive

19 years agofxRasterPrimitive wasn't always receiving the reduced primitive
Daniel Borca [Fri, 17 Dec 2004 08:08:37 +0000 (08:08 +0000)]
fxRasterPrimitive wasn't always receiving the reduced primitive

19 years agoAdded a TNL pipeline stage that normalizes texture coordinates as a
Felix Kuehling [Fri, 17 Dec 2004 00:01:15 +0000 (00:01 +0000)]
Added a TNL pipeline stage that normalizes texture coordinates as a
workaround for bad Savage hardware interpolation of big texture
coordinates.

19 years agoImport s3virge and trident drivers. Not functional yet; no Makefile, no DRI-aware...
Adam Jackson [Thu, 16 Dec 2004 19:26:23 +0000 (19:26 +0000)]
Import s3virge and trident drivers.  Not functional yet; no Makefile, no DRI-aware DDX.

19 years agofix typos in texcoord setup - fixes perspective correction bug
Brian Paul [Thu, 16 Dec 2004 17:33:36 +0000 (17:33 +0000)]
fix typos in texcoord setup - fixes perspective correction bug

19 years agoThe types uint32_t and uint8_t are not used in Mesa tree.
Vladimir Dergachev [Thu, 16 Dec 2004 14:04:49 +0000 (14:04 +0000)]
The types uint32_t and uint8_t are not used in Mesa tree.
Put a couple of defines to use GL counterparts.

19 years agoExperimental PRINT instruction for NV_vertex_program.
Brian Paul [Thu, 16 Dec 2004 03:07:18 +0000 (03:07 +0000)]
Experimental PRINT instruction for NV_vertex_program.
Basically, this lets you put a "PRINT 'mesage', register;" statement in a
vertex program to aid in debugging.

19 years agodon't divide texcoords by q if using a fragment program
Brian Paul [Thu, 16 Dec 2004 02:14:19 +0000 (02:14 +0000)]
don't divide texcoords by q if using a fragment program

19 years agoAlso PUBLICize the config option table
Adam Jackson [Thu, 16 Dec 2004 00:23:47 +0000 (00:23 +0000)]
Also PUBLICize the config option table

19 years agoMark __driCreateNewScreen PUBLIC
Adam Jackson [Wed, 15 Dec 2004 23:26:49 +0000 (23:26 +0000)]
Mark __driCreateNewScreen PUBLIC

19 years ago_glapi_* is effectively PUBLIC API for the DRI drivers.
Adam Jackson [Wed, 15 Dec 2004 23:14:29 +0000 (23:14 +0000)]
_glapi_* is effectively PUBLIC API for the DRI drivers.

19 years agoMark the XF86DRI client-side extension API as PUBLIC.
Adam Jackson [Wed, 15 Dec 2004 23:07:55 +0000 (23:07 +0000)]
Mark the XF86DRI client-side extension API as PUBLIC.

19 years agofxt1_decode_1() needs to be non-static for the tdfx and glide drivers.
Adam Jackson [Wed, 15 Dec 2004 22:57:59 +0000 (22:57 +0000)]
fxt1_decode_1() needs to be non-static for the tdfx and glide drivers.

19 years agoUnichrome DRI:
Thomas Hellström [Wed, 15 Dec 2004 21:59:25 +0000 (21:59 +0000)]
Unichrome DRI:
Updated the driver to the new VIA security mechanisms in DRM. All command
submissions now passes through DRM ioctls. If the DRM AGP ring-buffer is
not enabled, it will use a DRM mechanism for submitting commands to the
hardware via a PCI bus mechanism.

Removed all direct write accesses to the hardware. Among other things the
VQ was previously turned off for the PCI path, apparently for Tuxracer.
That seemed unneeded and was removed. No visible impact on Tuxracer.

Abstracted all buffer blit operations in via_ioctl.c. The blitter context
is now reprogrammed before each blitting operation.

Updated driver date and drm version requirement.
(Bugzilla Bug #1950, Thomas Hellström)

19 years agoUnichrome DRI:
Thomas Hellström [Wed, 15 Dec 2004 21:27:49 +0000 (21:27 +0000)]
Unichrome DRI:
Stop the driver from giving empty texture levels with erroneous HW addresses
to the hardware. These will get caught and rejected in the DRM command
verifier.

19 years agoUnichrome DRI:
Thomas Hellström [Wed, 15 Dec 2004 21:17:51 +0000 (21:17 +0000)]
Unichrome DRI:
Fixed an apparent race condition during locking and drawable info updating,
the result of which was the DRI client leaving traces on the screen rendering
where the drawable previously had been.
If the driver hangs X for a second or so and then restarts, this is probably
the place to look. (Thomas Hellström)

19 years agoUnichrome DRI driver:
Thomas Hellström [Wed, 15 Dec 2004 21:05:26 +0000 (21:05 +0000)]
Unichrome DRI driver:
Check for texture allocation failure (Bugzilla #1633, Bartlomiej Krol)
Reenabled AGP textures (Thomas Hellström)

19 years agoAdded configuration support to the Savage driver. Three options are
Felix Kuehling [Wed, 15 Dec 2004 17:45:23 +0000 (17:45 +0000)]
Added configuration support to the Savage driver. Three options are
supported so far.

19 years agoFix up glx/x11 to work when built with -fvisibility=hidden.
Adam Jackson [Wed, 15 Dec 2004 17:18:06 +0000 (17:18 +0000)]
Fix up glx/x11 to work when built with -fvisibility=hidden.

19 years agoFixed GL_CLAM_TO_EDGE. It's not supported in hardware. Use GL_CLAMP
Felix Kuehling [Wed, 15 Dec 2004 16:59:58 +0000 (16:59 +0000)]
Fixed GL_CLAM_TO_EDGE. It's not supported in hardware. Use GL_CLAMP
instead of GL_REPEAT.

19 years agoFixed initialization of some stencil-related S4 registers, which was
Felix Kuehling [Wed, 15 Dec 2004 16:54:19 +0000 (16:54 +0000)]
Fixed initialization of some stencil-related S4 registers, which was
misplaced in savageDDInitState_s3d, where was overwriting completely
unrelated S3D registers with garbage.

19 years agoMoved some code from savageCreateContext to savageInitDriver, where it
Felix Kuehling [Wed, 15 Dec 2004 16:50:57 +0000 (16:50 +0000)]
Moved some code from savageCreateContext to savageInitDriver, where it
belongs. Removed some obviously useless code. Fixed computation of
MaxTextureLevels.

19 years agoFixed some missing uint8_t -> u_int8_t.
Felix Kuehling [Wed, 15 Dec 2004 15:44:28 +0000 (15:44 +0000)]
Fixed some missing uint8_t -> u_int8_t.

19 years agoAdd _mesa_delete_texture_object() call to viaDeleteTexture
Keith Whitwell [Wed, 15 Dec 2004 13:59:47 +0000 (13:59 +0000)]
Add _mesa_delete_texture_object() call to viaDeleteTexture
[Freedesktop BUG 2080]

19 years agoAdd some catchall commands to realclean target to remove built files
Keith Whitwell [Wed, 15 Dec 2004 11:03:41 +0000 (11:03 +0000)]
Add some catchall commands to realclean target to remove built files
which are forgotten about when the configs/current symlink changes.

19 years agoupdated makefiles for gcc 3.4.3 and bnu 2.15
Daniel Borca [Wed, 15 Dec 2004 08:00:43 +0000 (08:00 +0000)]
updated makefiles for gcc 3.4.3 and bnu 2.15

19 years agominor info update
Daniel Borca [Wed, 15 Dec 2004 07:56:49 +0000 (07:56 +0000)]
minor info update

19 years agoadded DMesaProc type to prevent gcc 3.4.3 warnings
Daniel Borca [Wed, 15 Dec 2004 07:55:38 +0000 (07:55 +0000)]
added DMesaProc type to prevent gcc 3.4.3 warnings

19 years agoadded DMesaProc type to prevent gcc 3.4.3 warnings.
Daniel Borca [Wed, 15 Dec 2004 07:54:20 +0000 (07:54 +0000)]
added DMesaProc type to prevent gcc 3.4.3 warnings.
sw tc is disabled by default

19 years agoprotected elfish code against non-elf compilers
Daniel Borca [Wed, 15 Dec 2004 07:52:35 +0000 (07:52 +0000)]
protected elfish code against non-elf compilers

19 years agofixes for fragment programs
Brian Paul [Wed, 15 Dec 2004 01:13:39 +0000 (01:13 +0000)]
fixes for fragment programs

19 years agoinit span.w, dwdx, dwdy in case we're running a fragment program
Brian Paul [Wed, 15 Dec 2004 01:11:36 +0000 (01:11 +0000)]
init span.w, dwdx, dwdy in case we're running a fragment program

19 years agotweaks to the LIT instructions
Brian Paul [Wed, 15 Dec 2004 01:07:52 +0000 (01:07 +0000)]
tweaks to the LIT instructions

19 years agos/DP3/DP3_SAT/ to prevent negative values
Brian Paul [Wed, 15 Dec 2004 00:54:17 +0000 (00:54 +0000)]
s/DP3/DP3_SAT/ to prevent negative values

19 years agouint*t -> u_int*t
Alan Hourihane [Tue, 14 Dec 2004 22:37:46 +0000 (22:37 +0000)]
uint*t -> u_int*t

19 years agofix warning
Alan Hourihane [Tue, 14 Dec 2004 10:59:37 +0000 (10:59 +0000)]
fix warning

19 years agouint*t -> u_int*t changes
Alan Hourihane [Tue, 14 Dec 2004 09:11:52 +0000 (09:11 +0000)]
uint*t -> u_int*t changes

19 years agoAdded many (hopefully all) missing 'output="true"' attributes. Added
Ian Romanick [Mon, 13 Dec 2004 23:58:09 +0000 (23:58 +0000)]
Added many (hopefully all) missing 'output="true"' attributes.  Added
missing enum information for GL_EXT_cull_vertex and
GL_SGIS_texture_color_mask.  Added GL_SUN_mesh_array.  Corrected the
spelling of the "length" parameter to GetActiveUniformARB.

19 years agoTrivial shell script to search the API definition file and print out the
Ian Romanick [Mon, 13 Dec 2004 21:26:50 +0000 (21:26 +0000)]
Trivial shell script to search the API definition file and print out the
next numerically available API entry-point offset.

19 years agodisabled ClipMask usage in vb emitter (clipping bugs?)
Daniel Borca [Mon, 13 Dec 2004 08:44:46 +0000 (08:44 +0000)]
disabled ClipMask usage in vb emitter (clipping bugs?)

19 years agoremoved unused visInfo var
Brian Paul [Sun, 12 Dec 2004 22:24:09 +0000 (22:24 +0000)]
removed unused visInfo var

19 years agofix recursion problem introduced on Nov 27
Brian Paul [Sun, 12 Dec 2004 22:22:10 +0000 (22:22 +0000)]
fix recursion problem introduced on Nov 27

19 years agoAdded driver hooks for GetTexImage() and GetCompressedTexImage().
Brian Paul [Sun, 12 Dec 2004 19:03:16 +0000 (19:03 +0000)]
Added driver hooks for GetTexImage() and GetCompressedTexImage().
Added fallback _mesa_get_[compressed]_teximage() routines to texstore.c

19 years agoFix a couple of glitches
Keith Whitwell [Fri, 10 Dec 2004 17:18:00 +0000 (17:18 +0000)]
Fix a couple of glitches

19 years agoallow GetTexImage with RGBA format and COLOR_INDEX internalformat
Daniel Borca [Fri, 10 Dec 2004 07:36:35 +0000 (07:36 +0000)]
allow GetTexImage with RGBA format and COLOR_INDEX internalformat

19 years agotypo
Brian Paul [Thu, 9 Dec 2004 23:23:14 +0000 (23:23 +0000)]
typo

19 years agobring in 6.2.1 changes
Brian Paul [Thu, 9 Dec 2004 23:21:36 +0000 (23:21 +0000)]
bring in 6.2.1 changes

19 years agocheck if using a PBuffer in clip_for_xgetimage()
Brian Paul [Thu, 9 Dec 2004 16:23:03 +0000 (16:23 +0000)]
check if using a PBuffer in clip_for_xgetimage()

19 years agoGet linux-solo dependencies building correctly,
Keith Whitwell [Thu, 9 Dec 2004 08:42:19 +0000 (08:42 +0000)]
Get linux-solo dependencies building correctly,
Make sure symlinks are built in driver directories before running makedepend.

19 years agomake sure we're cleaning up everything
Daniel Borca [Thu, 9 Dec 2004 07:44:37 +0000 (07:44 +0000)]
make sure we're cleaning up everything

19 years agosimplistic ICD implementation for fx/Mesa
Daniel Borca [Thu, 9 Dec 2004 07:43:59 +0000 (07:43 +0000)]
simplistic ICD implementation for fx/Mesa

19 years agoback out Keiths last checkin - for Solo the include order is important
Dave Airlie [Thu, 9 Dec 2004 00:25:06 +0000 (00:25 +0000)]
back out Keiths last checkin - for Solo the include order is important

19 years agofixup pci code for Jon's last checkin for changing page size
Dave Airlie [Thu, 9 Dec 2004 00:18:59 +0000 (00:18 +0000)]
fixup pci code for Jon's last checkin for changing page size

19 years ago(Stephane Marchesin, me) add hyperz support to radeon and r200 drivers. Only fast...
Roland Scheidegger [Wed, 8 Dec 2004 17:32:46 +0000 (17:32 +0000)]
(Stephane Marchesin, me) add hyperz support to radeon and r200 drivers. Only fast z clear and z buffer compression are supported for now, hierarchical-z is not. Still problems with multiple apps and z/stencil readback, which is why hyperz is disabled per default. Also add the new point sprite packet drm 1.13 accepts to the sanity code.

19 years agoImprove the behaviour of the build system wrt depend files.
Keith Whitwell [Wed, 8 Dec 2004 15:16:36 +0000 (15:16 +0000)]
Improve the behaviour of the build system wrt depend files.

- Remove the -Y option for makedepend, so that the standard
  directories are searched
- No longer pipe the multiple errors that the -Y option caused
  into /dev/null -- we want to know about these failures.
- Fix up a few other misc makedepend failures.

19 years agoDemonstrate using a color matrix for yuv-to-rgb conversion at texture
Keith Whitwell [Wed, 8 Dec 2004 14:56:40 +0000 (14:56 +0000)]
Demonstrate using a color matrix for yuv-to-rgb conversion at texture
upload time.

19 years agoUse union type to avoid strict aliasing problems.
Alan Hourihane [Wed, 8 Dec 2004 14:26:48 +0000 (14:26 +0000)]
Use union type to avoid strict aliasing problems.

19 years agosilence warnings
Alan Hourihane [Wed, 8 Dec 2004 14:00:46 +0000 (14:00 +0000)]
silence warnings

19 years agoCheck for some header defines before redefining functions. Silences warnings.
Alan Hourihane [Wed, 8 Dec 2004 12:59:15 +0000 (12:59 +0000)]
Check for some header defines before redefining functions. Silences warnings.

19 years agosilence warning
Alan Hourihane [Wed, 8 Dec 2004 12:35:55 +0000 (12:35 +0000)]
silence warning