bzr commit into mysql-next-mr branch (tor.didriksen:3363) WL#1326

[Tor Didriksen]

#At file:///export/home/didrik/repo/next-mr-bugfixing/ based on revid:holyfoot@stripped

 3363 Tor Didriksen	2010-11-05
      WL#1326 Precise GIS functions
      Post-merge fix broken build.
     @ sql/gcalc_slicescan.h
        error: suggest a space before ';' or explicit braces around empty body in 'while' statement
     @ sql/plistsort.c
        'typedef ignored'

    modified:
      sql/gcalc_slicescan.h
      sql/plistsort.c
=== modified file 'sql/gcalc_slicescan.h'
--- a/sql/gcalc_slicescan.h	2010-10-28 09:54:31 +0000
+++ b/sql/gcalc_slicescan.h	2010-11-05 09:34:03 +0000
@@ -391,7 +391,8 @@ public:
   const Gcalc_scan_iterator::point *rb() const
   {
     const Gcalc_scan_iterator::point *result= sp0;
-    while ((result= result->c_get_next())->is_bottom());
+    while ((result= result->c_get_next())->is_bottom())
+    {}
     return result;
   }
   const Gcalc_scan_iterator::point *rt() const

=== modified file 'sql/plistsort.c'
--- a/sql/plistsort.c	2010-06-30 11:04:45 +0000
+++ b/sql/plistsort.c	2010-11-05 09:34:03 +0000
@@ -33,7 +33,7 @@ typedef struct LS_STRUCT_NAME
   LS_LIST_ITEM *list1;
   int list_len;
   int return_point;
-};
+} LS_STRUCT_NAME;
 
 LS_SCOPE LS_LIST_ITEM* LS_NAME(LS_COMPARE_FUNC_DECL LS_LIST_ITEM *list, int list_len)
 {


Attachment: [text/bzr-bundle] bzr/[e-mail]