patches/fltk2-02-sunstudio.diff
author jurikm
Sun, 25 Sep 2011 20:14:40 +0000
changeset 3788 4944eb5ccb7a
permissions -rw-r--r--
SFEfltk2.spec: fix Sun Studio build
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3788
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
     1
--- fltk-2.0.x-alpha-r8800/src/fltk_theme.cxx	2011-09-25 21:57:40.368955597 +0200
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
     2
+++ fltk-2.0.x-alpha-r8800/src/fltk_theme.cxx	2011-09-25 21:56:47.044860650 +0200
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
     3
@@ -115 +115 @@
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
     4
-        sprintf(buffer, "frame0%d", i+1);
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
     5
+        std::sprintf(buffer, "frame0%d", i+1);
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
     6
@@ -117 +117 @@
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
     7
-        sprintf(buffer, "frame%d",  i);
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
     8
+        std::sprintf(buffer, "frame%d",  i);
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
     9
@@ -326 +326 @@
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    10
-      if(strcmp(pattern, "return") == 0)
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    11
+      if(std::strcmp(pattern, "return") == 0)
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    12
--- fltk-2.0.x-alpha-r8800/src/addarc.cxx	2011-03-03 10:20:46.000000000 +0100
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    13
+++ fltk-2.0.x-alpha-r8800/src/addarc.cxx	2011-09-25 22:05:28.807213632 +0200
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    14
@@ -36,6 +36,10 @@
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    15
 #include <fltk/math.h>
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    16
 using namespace fltk;
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    17
 
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    18
+#if USE_CAIRO
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    19
+extern void fl_set_cairo_ctm();
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    20
+#endif
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    21
+
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    22
 /*!
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    23
   Add a series of points to the current path on the arc of an
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    24
   ellipse. The ellipse in inscribed in the l,t,w,h rectangle, and the
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    25
@@ -48,7 +52,6 @@
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    26
 {
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    27
 #if USE_CAIRO
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    28
   cairo_save(cr);
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    29
-  extern void fl_set_cairo_ctm();
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    30
   fl_set_cairo_ctm();
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    31
   float x = l+w/2;
4944eb5ccb7a SFEfltk2.spec: fix Sun Studio build
jurikm
parents:
diff changeset
    32
   float y = t+h/2;