summaryrefslogtreecommitdiff
path: root/Master/tlpkg/tlperl/lib/Tk/pTk
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-04-23 21:46:20 +0000
committerKarl Berry <karl@freefriends.org>2014-04-23 21:46:20 +0000
commit300c1eb6d37d46078d448d6d58938d5a80cd68ff (patch)
tree23a0a8b9f8f5460b405119c4d3c163d2d488ca5e /Master/tlpkg/tlperl/lib/Tk/pTk
parented55d86b7c5e18f6eccce80a1fb1423ca40a23b5 (diff)
(tl)perl 5.18.2 for windows from siep
git-svn-id: svn://tug.org/texlive/trunk@33648 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/tlperl/lib/Tk/pTk')
-rw-r--r--Master/tlpkg/tlperl/lib/Tk/pTk/Lang.h4
-rw-r--r--Master/tlpkg/tlperl/lib/Tk/pTk/tixGrid.h2
-rw-r--r--Master/tlpkg/tlperl/lib/Tk/pTk/tixTList.h2
-rw-r--r--Master/tlpkg/tlperl/lib/Tk/pTk/tkConfig.h3
4 files changed, 5 insertions, 6 deletions
diff --git a/Master/tlpkg/tlperl/lib/Tk/pTk/Lang.h b/Master/tlpkg/tlperl/lib/Tk/pTk/Lang.h
index 4598291f872..b09cede6bfb 100644
--- a/Master/tlpkg/tlperl/lib/Tk/pTk/Lang.h
+++ b/Master/tlpkg/tlperl/lib/Tk/pTk/Lang.h
@@ -4,10 +4,6 @@
#define STATIC_BUILD
-#ifdef bool
-#undef bool
-#endif
-
#include "tkConfig.h"
#define TCL_NO_DEPRECATED
diff --git a/Master/tlpkg/tlperl/lib/Tk/pTk/tixGrid.h b/Master/tlpkg/tlperl/lib/Tk/pTk/tixGrid.h
index b1733b64e18..90cee98909b 100644
--- a/Master/tlpkg/tlperl/lib/Tk/pTk/tixGrid.h
+++ b/Master/tlpkg/tlperl/lib/Tk/pTk/tixGrid.h
@@ -244,7 +244,7 @@ typedef struct GridStruct {
TixFont font; /* Default font used by the DItems. */
/* Text drawing */
- Cursor cursor; /* Current cursor for window, or None. */
+ Tk_Cursor cursor; /* Current cursor for window, or None. */
/* For highlights */
int highlightWidth; /* Width in pixels of highlight to draw
diff --git a/Master/tlpkg/tlperl/lib/Tk/pTk/tixTList.h b/Master/tlpkg/tlperl/lib/Tk/pTk/tixTList.h
index 52584a022b8..314b4ec4c6c 100644
--- a/Master/tlpkg/tlperl/lib/Tk/pTk/tixTList.h
+++ b/Master/tlpkg/tlperl/lib/Tk/pTk/tixTList.h
@@ -77,7 +77,7 @@ typedef struct ListStruct {
TixFont font; /* Default font used by the DItems. */
/* Text drawing */
- Cursor cursor; /* Current cursor for window, or None. */
+ Tk_Cursor cursor; /* Current cursor for window, or None. */
/* For highlights */
int highlightWidth; /* Width in pixels of highlight to draw
diff --git a/Master/tlpkg/tlperl/lib/Tk/pTk/tkConfig.h b/Master/tlpkg/tlperl/lib/Tk/pTk/tkConfig.h
index 02cc8036e79..fd15066b441 100644
--- a/Master/tlpkg/tlperl/lib/Tk/pTk/tkConfig.h
+++ b/Master/tlpkg/tlperl/lib/Tk/pTk/tkConfig.h
@@ -1,7 +1,10 @@
#ifndef _TKCONFIG
#define _TKCONFIG
#define ANSI_SIGNED_CHAR 1
+#define CAN_COPSTASH_SET_NULL 1
#define HAS_STDARG 1
+#define HAS_SVIV_NOMG 1
+#define HAS_SVNV_NOMG 1
#define HAVE_LIMITS_H 1
#define LSEEK_TYPE long long
#define SELECT_MASK Perl_fd_set