Merge commit '515673c08f8718a237e90c2130a1f5294f966d6a'

[xonotic/netradiant.git] / radiant / texmanip.h

diff --git a/radiant/texmanip.h b/radiant/texmanip.h
index 07548700e0096e8fcc78751b1730a26c98fe1288..3cca3ce29bff7f6847dc12529f49d39dbf851d1f 100644 (file)
--- a/radiant/texmanip.h
+++ b/radiant/texmanip.h
@@ -29,11 +29,12 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 */
 
-#ifndef _TEXMANIP_H_
-#define _TEXMANIP_H_
+#if !defined(INCLUDED_TEXMANIP_H)
+#define INCLUDED_TEXMANIP_H
 
-void R_ResampleTextureLerpLine (byte *in, byte *out, int inwidth, int outwidth, int bytesperpixel);
-void R_ResampleTexture (void *indata, int inwidth, int inheight, void *outdata,  int outwidth, int outheight, int bytesperpixel);
+typedef unsigned char byte;
+
+void R_ResampleTexture (const void *indata, int inwidth, int inheight, void *outdata,  int outwidth, int outheight, int bytesperpixel);
 void GL_MipReduce(byte *in, byte *out, int width, int height, int destwidth, int destheight);
 
-#endif // _TEXMANIP_H_
+#endif