Merge pull request #335 from macvim-dev/fix/gui_mch_get_rgb

splhack · web-flow · commit c20131f0f8e5 · 2016-08-22T23:13:51.000-07:00
Sync gui_mch_get_rgb with 7.4.2243
diff --git a/src/MacVim/gui_macvim.m b/src/MacVim/gui_macvim.m
@@ -1597,7 +1597,7 @@
 /*
  * Return the RGB value of a pixel as long.
  */
-    long_u
+    guicolor_T
 gui_mch_get_rgb(guicolor_T pixel)
 {
     // This is only implemented so that vim can guess the correct value for
diff --git a/src/proto/gui_macvim.pro b/src/proto/gui_macvim.pro
@@ -121,7 +121,7 @@ gui_mch_enable_scrollbar(
 gui_mch_flash(int msec);
     guicolor_T
 gui_mch_get_color(char_u *name);
-    long_u
+    guicolor_T
 gui_mch_get_rgb(guicolor_T pixel);
     void
 gui_mch_get_screen_dimensions(int *screen_w, int *screen_h);

Original file line number	Diff line number	Diff line change
`@@ -1597,7 +1597,7 @@`
`1597`	`1597`	`/*`
`1598`	`1598`	`* Return the RGB value of a pixel as long.`
`1599`	`1599`	`*/`
`1600`		`- long_u`
	`1600`	`+ guicolor_T`
`1601`	`1601`	`gui_mch_get_rgb(guicolor_T pixel)`
`1602`	`1602`	`{`
`1603`	`1603`	`// This is only implemented so that vim can guess the correct value for`