From 031202b57154ac378a03b3524dfa155e6110df03 Mon Sep 17 00:00:00 2001
From: lecoanet
Date: Tue, 22 Mar 2005 15:28:01 +0000
Subject: Shut up compilation warnings and inconsistencies Suppress private.h
 and __unused attribute for unused function parameters

---
 generic/Types.h | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'generic')

diff --git a/generic/Types.h b/generic/Types.h
index 19c6507..e02b75b 100644
--- a/generic/Types.h
+++ b/generic/Types.h
@@ -38,6 +38,11 @@
 #  if defined(_MSC_VER)
 #    define DllEntryPoint DllMain
 #  endif
+// Suppress complaints about deprecated standard C functions
+// like strcpy and strcat
+#  ifndef __GNUC__
+#    pragma warning(disable : 4996)
+#  endif
 #endif
 
 #ifdef GL
@@ -48,8 +53,6 @@
 #  endif
 #endif
 
-#include "private.h"
-
 #define NEED_REAL_STDIO
 
 #include <tk.h>
@@ -136,7 +139,12 @@ Tk_GetScrollInfo(interp, argc, (Tcl_Obj **) args, fract, count)
 #    define TCL_STORAGE_CLASS DLLIMPORT
 #  endif
 
-#  undef XFillRectangle
+#  ifndef __GNUC__
+// Okay, Those Xlib functions will bring inconsistancy errors
+// as they are already provided by Tk portability layer, shut them up.
+#  pragma warning(disable : 4273)
+#  endif
+#undef XFillRectangle
 void XFillRectangle(Display *display, Drawable d, GC gc, int x, int y,
 		    unsigned int width, unsigned int height);
 #  undef XFillRectangles
-- 
cgit v1.1