From b65f9c97e34062a985f0443858b148878ffbfac2 Mon Sep 17 00:00:00 2001
From: Patrick Monnerat <pm@datasphere.ch>
Date: Wed, 26 Aug 2015 13:10:37 +0200
Subject: [PATCH] plugins: unbundle tcl and adjust to latest cygwin.

* gdbtk/plugins/Make-rules: Use Tcl private include C flags from autotools
  for Windows.
* gdbtk/plugins/rhabout/rhabout.c: Use __declspec(dllexport) for all
  Windows builds.
  (DllMain): Define for all native Windows builds. Remember Cygwin is not
  a native Windows environment anymore.
---
 gdbtk/plugins/Make-rules        | 2 +-
 gdbtk/plugins/rhabout/rhabout.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gdbtk/plugins/Make-rules b/gdbtk/plugins/Make-rules
index 1e5113f..37baece 100644
--- a/gdbtk/plugins/Make-rules
+++ b/gdbtk/plugins/Make-rules
@@ -46,7 +46,7 @@ PLUGIN_MODULE = $(PLUGIN)$(TCL_SHLIB_SUFFIX)
 
 # Must include a path to tclWinInt.h on cygwin
 ifeq ($(TCL_SHLIB_SUFFIX),.dll)
-CYGWIN_CFLAGS=-I$(srcdir)/../../../../tcl/win
+CYGWIN_CFLAGS=$(TCL_PRIVATE_INCLUDE)
 else
 CYGWIN_CFLAGS=
 endif
diff --git a/gdbtk/plugins/rhabout/rhabout.c b/gdbtk/plugins/rhabout/rhabout.c
index cc7d80a..82ce7a0 100644
--- a/gdbtk/plugins/rhabout/rhabout.c
+++ b/gdbtk/plugins/rhabout/rhabout.c
@@ -4,7 +4,7 @@
 #include <tcl.h>
 
 /* Define the functions that implement your commands as required by Tcl */
-#ifdef __CYGWIN__
+#if defined(__WIN32__) || defined(_WIN64)
 #  define EXPORT __declspec(dllexport)
 #else
 #  define EXPORT /* nothing */
@@ -41,8 +41,8 @@ Rhabout_Init (Tcl_Interp *interp)
   return TCL_OK;
 }
 
-/* This is REQUIRED for cygwin */
-#ifdef __CYGWIN__
+/* This is REQUIRED for native windows implementations. */
+#ifdef TCL_PLATFORM_WIN
 #include <windows.h>
 #include <tclInt.h>
 
-- 
2.43.5