Message-ID: <48617267.5030309@lysator.liu.se>
Date: Wed, 25 Jun 2008 00:17:11 +0200
From: Peter Rosin <peda AT lysator DOT liu DOT se>
User-Agent: Thunderbird 2.0.0.14 (Windows/20080421)
MIME-Version: 1.0
To: cygwin AT cygwin DOT com
CC: dr DOT volker DOT zell AT oracle DOT com
Subject: ggi terminal for gnuplot
Content-Type: multipart/mixed;  boundary="------------090200000509060106000305"
Mailing-List: contact cygwin-help AT cygwin DOT com; run by ezmlm
Sender: cygwin-owner AT cygwin DOT com
Mail-Followup-To: cygwin AT cygwin DOT com

--------------090200000509060106000305
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Hi!

I noticed the following in the cygport file of gnuplot

	# This gives parse errors
	#  --with-ggi

and thought I'd have a look.

The cause is a type cleanup in libggi, and here's a patch to
make gnuplot follow.

Unfortunately the build is killed later by some tex config thing
that I don't have the energy to follow up on, so I have not
tested if this does anything useful other than fixing the first
ggi related build error. Since I don't know if there are more
problems later in the build I'm sending this anyway.

Another variant would be to build with GG_NEED_OLD_INTTYPES
defined, but I think the attached patch is a better approach.

Cheers,
Peter

--------------090200000509060106000305
Content-Type: text/plain;
 name="ggi.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="ggi.patch"

--- gnuplot-4.2.3/term/ggi.trm.old	2008-06-25 00:02:24.951334700 +0200
+++ gnuplot-4.2.3/term/ggi.trm	2008-06-25 00:02:42.826509600 +0200
@@ -116,9 +116,9 @@
 } GGI_vertex_t;
 
 TERM_PUBLIC long int GGI_SetTime(const struct timeval* current);
-TERM_PUBLIC int GGI_from_keysym __PROTO((uint32 keysym));
-TERM_PUBLIC int GGI_from_button __PROTO((uint32 button));
-TERM_PUBLIC int GGI_y __PROTO((sint32 y));
+TERM_PUBLIC int GGI_from_keysym __PROTO((uint32_t keysym));
+TERM_PUBLIC int GGI_from_button __PROTO((uint32_t button));
+TERM_PUBLIC int GGI_y __PROTO((int32_t y));
 TERM_PUBLIC int GGI_dispatch_event __PROTO((const ggi_event* event));
 TERM_PUBLIC int GGI_eventually_update_modifiers __PROTO((const ggi_event* event, const int add));
 TERM_PUBLIC int GGI_waitforinput __PROTO((void));
@@ -645,7 +645,7 @@
 
 /* translate ggi keysym to gnuplot keysym */
 TERM_PUBLIC int
-GGI_from_keysym(uint32 keysym)
+GGI_from_keysym(uint32_t keysym)
 {
     switch (keysym) {
 	case GIIUC_BackSpace:
@@ -811,7 +811,7 @@
 }
 
 TERM_PUBLIC int
-GGI_from_button(uint32 button)
+GGI_from_button(uint32_t button)
 {
     switch (button) {
     case GII_PBUTTON_LEFT:
@@ -827,7 +827,7 @@
 }
 
 TERM_PUBLIC int
-GGI_y(sint32 y)
+GGI_y(int32_t y)
 {
     return GGIymax - y;
 }


--------------090200000509060106000305
Content-Type: text/plain; charset=us-ascii

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Problem reports:       http://cygwin.com/problems.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/
--------------090200000509060106000305--