From: Siarhei Siamashka <siarhei.siamas...@nokia.com>

This reverts commit b924bb1f8191cc7c386d8211d9822aeeaadcab44.

There is a better fix for these Solaris Studio warnings.
---
 pixman/pixman-bits-image.c |    6 ++----
 pixman/pixman-compiler.h   |    3 +--
 pixman/pixman-fast-path.h  |    4 +---
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/pixman/pixman-bits-image.c b/pixman/pixman-bits-image.c
index ff2dde3..1fdd742 100644
--- a/pixman/pixman-bits-image.c
+++ b/pixman/pixman-bits-image.c
@@ -1016,8 +1016,7 @@ convert_r5g6b5 (const uint8_t *row, int x)
                                          convert_ ## format,           \
                                          PIXMAN_ ## format,            \
                                          repeat_mode);                 \
-    }                                                                  \
-    extern int no_such_variable
+    }
 
 #define MAKE_NEAREST_FETCHER(name, format, repeat_mode)                        
\
     static void                                                                
\
@@ -1033,8 +1032,7 @@ convert_r5g6b5 (const uint8_t *row, int x)
                                         convert_ ## format,            \
                                         PIXMAN_ ## format,             \
                                         repeat_mode);                  \
-    }                                                                  \
-    extern int no_such_variable
+    }
 
 #define MAKE_FETCHERS(name, format, repeat_mode)                       \
     MAKE_NEAREST_FETCHER (name, format, repeat_mode);                  \
diff --git a/pixman/pixman-compiler.h b/pixman/pixman-compiler.h
index 0e08589..8f6c787 100644
--- a/pixman/pixman-compiler.h
+++ b/pixman/pixman-compiler.h
@@ -191,8 +191,7 @@
                value = tls_ ## name ## _alloc ();                      \
        }                                                               \
        return value;                                                   \
-    }                                                                  \
-    extern int no_such_variable                                                
+    }
 
 #   define PIXMAN_GET_THREAD_LOCAL(name)                               \
     tls_ ## name ## _get ()
diff --git a/pixman/pixman-fast-path.h b/pixman/pixman-fast-path.h
index 6fe448c..ed09ba5 100644
--- a/pixman/pixman-fast-path.h
+++ b/pixman/pixman-fast-path.h
@@ -381,9 +381,7 @@ fast_composite_scaled_nearest_ ## scale_func_name 
(pixman_implementation_t *imp,
                          OP, repeat_mode)                                      
        \
     FAST_NEAREST_MAINLOOP(scale_func_name##_##OP,                              
        \
                          scaled_nearest_scanline_ ## scale_func_name ## _ ## 
OP,       \
-                         src_type_t, dst_type_t, repeat_mode)                  
        \
-                                                                               
        \
-    extern int no_such_variable
+                         src_type_t, dst_type_t, repeat_mode)
 
 
 #define SCALED_NEAREST_FLAGS                                           \
-- 
1.7.2.2

_______________________________________________
Pixman mailing list
Pixman@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/pixman

Reply via email to