* Rename _cucul_set_canvas_size into __cucul_set_canvas_size to prevent

collisions due to symbol mangling.

caca/driver_cocoa.m

@@ -834,7 +834,7 @@ static int cocoa_init_graphics(caca_display_t *dp)
         return -1;
 
     unsigned int width = dp->cv->width, height = dp->cv->height;
-    _cucul_set_canvas_size(dp->cv, width ? width : 80, height ? height : 32);
+    __cucul_set_canvas_size(dp->cv, width ? width : 80, height ? height : 32);
 
     // first create a full cocoa app if the host has no bundle
     if(![[NSBundle mainBundle] bundleIdentifier])

caca/driver_conio.c

@@ -58,8 +58,8 @@ static int conio_init_graphics(caca_display_t *dp)
 #   else
     /* FIXME */
 #   endif
-    _cucul_set_canvas_size(dp->cv, dp->drv.p->ti.screenwidth,
-                                   dp->drv.p->ti.screenheight);
+    __cucul_set_canvas_size(dp->cv, dp->drv.p->ti.screenwidth,
+                                    dp->drv.p->ti.screenheight);
     return 0;
 }
 

caca/driver_gl.c

@@ -102,7 +102,7 @@ static int gl_init_graphics(caca_display_t *dp)
         sscanf(geometry, "%ux%u", &width, &height);
 #endif
 
-    _cucul_set_canvas_size(dp->cv, width ? width : 80, height ? height : 32);
+    __cucul_set_canvas_size(dp->cv, width ? width : 80, height ? height : 32);
 
     /* Load a libcucul internal font */
     fonts = cucul_get_font_list();

caca/driver_ncurses.c

@@ -301,7 +301,7 @@ static int ncurses_init_graphics(caca_display_t *dp)
             }
         }
 
-    _cucul_set_canvas_size(dp->cv, COLS, LINES);
+    __cucul_set_canvas_size(dp->cv, COLS, LINES);
 
     return 0;
 }

caca/driver_raw.c

@@ -40,7 +40,7 @@ static int raw_init_graphics(caca_display_t *dp)
         sscanf(geometry, "%ux%u", &width, &height);
 #endif
 
-    _cucul_set_canvas_size(dp->cv, width ? width : 80, height ? height : 24);
+    __cucul_set_canvas_size(dp->cv, width ? width : 80, height ? height : 24);
 
     return 0;
 }

caca/driver_slang.c

@@ -170,7 +170,7 @@ static int slang_init_graphics(caca_display_t *dp)
     SLtt_utf8_enable(1);
 #endif
 
-    _cucul_set_canvas_size(dp->cv, SLtt_Screen_Cols, SLtt_Screen_Rows);
+    __cucul_set_canvas_size(dp->cv, SLtt_Screen_Cols, SLtt_Screen_Rows);
 
     return 0;
 }

caca/driver_vga.c

@@ -76,7 +76,7 @@ static int vga_init_graphics(caca_display_t *dp)
     outb(tmp, 0x3d5);
 
     /* We don't have much choice */
-    _cucul_set_canvas_size(dp->cv, 80, 25);
+    __cucul_set_canvas_size(dp->cv, 80, 25);
 
     return 0;
 }

caca/driver_win32.c

@@ -126,8 +126,9 @@ static int win32_init_graphics(caca_display_t *dp)
     if(!GetConsoleScreenBufferInfo(dp->drv.p->screen, &csbi))
         return -1;
 
-    _cucul_set_canvas_size(dp->cv, csbi.srWindow.Right - csbi.srWindow.Left + 1,
-                           csbi.srWindow.Bottom - csbi.srWindow.Top + 1);
+    __cucul_set_canvas_size(dp->cv,
+                            csbi.srWindow.Right - csbi.srWindow.Left + 1,
+                            csbi.srWindow.Bottom - csbi.srWindow.Top + 1);
 
     SetConsoleMode(dp->drv.p->screen, 0);
 

caca/driver_x11.c

@@ -88,7 +88,7 @@ static int x11_init_graphics(caca_display_t *dp)
         sscanf(geometry, "%ux%u", &width, &height);
 #endif
 
-    _cucul_set_canvas_size(dp->cv, width ? width : 80, height ? height : 32);
+    __cucul_set_canvas_size(dp->cv, width ? width : 80, height ? height : 32);
 
     dp->drv.p->dpy = XOpenDisplay(NULL);
     if(dp->drv.p->dpy == NULL)

caca/graphics.c

@@ -238,7 +238,7 @@ void _caca_handle_resize(caca_display_t *dp)
 
     /* Tell libcucul we changed size */
     if(dp->resize.w != dp->cv->width || dp->resize.h != dp->cv->height)
-        _cucul_set_canvas_size(dp->cv, dp->resize.w, dp->resize.h);
+        __cucul_set_canvas_size(dp->cv, dp->resize.w, dp->resize.h);
 }
 
 void _caca_set_term_title(char const *str)

cucul/cucul.c

@@ -81,7 +81,7 @@ cucul_canvas_t * cucul_create_canvas(unsigned int width, unsigned int height)
     _cucul_load_frame_info(cv);
     cucul_set_color_ansi(cv, CUCUL_DEFAULT, CUCUL_TRANSPARENT);
 
-    if(_cucul_set_canvas_size(cv, width, height) < 0)
+    if(__cucul_set_canvas_size(cv, width, height) < 0)
     {
         int saved_errno = geterrno();
         free(cv->frames[0].name);
@@ -137,7 +137,7 @@ int cucul_set_canvas_size(cucul_canvas_t *cv, unsigned int width,
         return -1;
     }
 
-    return _cucul_set_canvas_size(cv, width, height);
+    return __cucul_set_canvas_size(cv, width, height);
 }
 
 /** \brief Get the canvas width.
@@ -231,8 +231,8 @@ int cucul_rand(int min, int max)
  * XXX: The following functions are local.
  */
 
-int _cucul_set_canvas_size(cucul_canvas_t *cv, unsigned int width,
-                                               unsigned int height)
+int __cucul_set_canvas_size(cucul_canvas_t *cv, unsigned int width,
+                                                unsigned int height)
 {
     unsigned int x, y, f, old_width, old_height, new_size, old_size;
 

cucul/cucul_internals.h

@@ -61,7 +61,8 @@ struct cucul_buffer
 };
 
 /* Canvas functions */
-extern int _cucul_set_canvas_size(cucul_canvas_t *, unsigned int, unsigned int);
+extern int __cucul_set_canvas_size(cucul_canvas_t *,
+                                   unsigned int, unsigned int);
 
 /* Colour functions */
 extern uint16_t _cucul_attr_to_rgb12fg(uint32_t);

msvc/libcucul.def

@@ -1,4 +1,4 @@
 LIBRARY "libcucul"
 
 EXPORTS
-    _cucul_set_canvas_size ; Private symbol used by libcaca
+    __cucul_set_canvas_size ; Private symbol used by libcaca