diff -ur orig/pinentry-1.1.0/pinentry/pinentry.c pinentry-1.1.0/pinentry/pinentry.c
--- orig/pinentry-1.1.0/pinentry/pinentry.c	2017-12-03 11:13:15.000000000 -0500
+++ pinentry-1.1.0/pinentry/pinentry.c	2018-11-02 15:29:16.945203400 -0400
@@ -97,7 +97,7 @@
      Don't reset them.  */
   int grab = pinentry.grab;
   char *ttyname = pinentry.ttyname;
-  char *ttytype = pinentry.ttytype;
+  char *ttytype_ = pinentry.ttytype_;
   char *ttyalert = pinentry.ttyalert;
   char *lc_ctype = pinentry.lc_ctype;
   char *lc_messages = pinentry.lc_messages;
@@ -135,7 +135,7 @@
   if (use_defaults)
     {
       free (pinentry.ttyname);
-      free (pinentry.ttytype);
+      free (pinentry.ttytype_);
       free (pinentry.ttyalert);
       free (pinentry.lc_ctype);
       free (pinentry.lc_messages);
@@ -194,7 +194,7 @@
     {
       pinentry.grab = grab;
       pinentry.ttyname = ttyname;
-      pinentry.ttytype = ttytype;
+      pinentry.ttytype_ = ttytype_;
       pinentry.ttyalert = ttyalert;
       pinentry.lc_ctype = lc_ctype;
       pinentry.lc_messages = lc_messages;
@@ -950,8 +950,8 @@
 	    }
 	  break;
 	case 'N':
-	  pinentry.ttytype = strdup (pargs.r.ret_str);
-	  if (!pinentry.ttytype)
+	  pinentry.ttytype_ = strdup (pargs.r.ret_str);
+	  if (!pinentry.ttytype_)
 	    {
 #ifndef HAVE_W32CE_SYSTEM
 	      fprintf (stderr, "%s: %s\n", this_pgmname, strerror (errno));
@@ -1070,10 +1070,10 @@
     }
   else if (!strcmp (key, "ttytype"))
     {
-      if (pinentry.ttytype)
-	free (pinentry.ttytype);
-      pinentry.ttytype = strdup (value);
-      if (!pinentry.ttytype)
+      if (pinentry.ttytype_)
+	free (pinentry.ttytype_);
+      pinentry.ttytype_ = strdup (value);
+      if (!pinentry.ttytype_)
 	return gpg_error_from_syserror ();
     }
   else if (!strcmp (key, "ttyalert"))
@@ -1755,7 +1755,7 @@
     {
       snprintf (buffer, sizeof buffer, "%s %s %s",
                 pinentry.ttyname? pinentry.ttyname : "-",
-                pinentry.ttytype? pinentry.ttytype : "-",
+                pinentry.ttytype_? pinentry.ttytype_ : "-",
                 pinentry.display? pinentry.display : "-" );
       buffer[sizeof buffer -1] = 0;
       rc = assuan_send_data (ctx, buffer, strlen (buffer));
diff -ur orig/pinentry-1.1.0/pinentry/pinentry.h pinentry-1.1.0/pinentry/pinentry.h
--- orig/pinentry-1.1.0/pinentry/pinentry.h	2017-12-03 11:13:05.000000000 -0500
+++ pinentry-1.1.0/pinentry/pinentry.h	2018-11-02 15:25:42.578732900 -0400
@@ -75,7 +75,7 @@
      supported.  (Assuan: "OPTION ttyname TTYNAME".)  */
   char *ttyname;
   /* The type of the terminal.  (Assuan: "OPTION ttytype TTYTYPE".)  */
-  char *ttytype;
+  char *ttytype_;
   /* Set the alert mode (none, beep or flash).  */
   char *ttyalert;
   /* The LC_CTYPE value for the terminal.  (Assuan: "OPTION lc-ctype
diff -ur orig/pinentry-1.1.0/pinentry/pinentry-curses.c pinentry-1.1.0/pinentry/pinentry-curses.c
--- orig/pinentry-1.1.0/pinentry/pinentry-curses.c	2017-12-03 11:13:05.000000000 -0500
+++ pinentry-1.1.0/pinentry/pinentry-curses.c	2018-11-02 15:27:00.269222900 -0400
@@ -1188,7 +1188,7 @@
     }
 #endif
 
-  rc = dialog_run (pinentry, pinentry->ttyname, pinentry->ttytype);
+  rc = dialog_run (pinentry, pinentry->ttyname, pinentry->ttytype_);
   do_touch_file (pinentry);
   return rc;
 }