Merge branch 'pull/3692'

[rails.git] / db / functions / quadtile.c

diff --git a/db/functions/quadtile.c b/db/functions/quadtile.c
index 29758edc6cf7b53c556acfc03aab9e98b56ef6bf..0f787b7395d20145a6e7ab96d7e08c6bd90e2858 100644 (file)
--- a/db/functions/quadtile.c
+++ b/db/functions/quadtile.c
@@ -1,54 +1,5 @@
-#ifndef USE_MYSQL
-#ifndef USE_PGSQL
-#error One of USE_MYSQL or USE_PGSQL must be defined
-#endif
-#endif
-
 #include <math.h>
 #include <quad_tile.h>
-
-#ifdef USE_MYSQL
-#ifdef USE_PGSQL
-#error ONLY one of USE_MYSQL and USE_PGSQL should be defined
-#endif
-
-#include <my_global.h>
-#include <my_sys.h>
-#include <m_string.h>
-#include <mysql.h>
-
-my_bool tile_for_point_init(UDF_INIT *initid, UDF_ARGS *args, char *message)
-{
-   if ( args->arg_count != 2 ||
-        args->arg_type[0] != INT_RESULT ||
-        args->arg_type[1] != INT_RESULT )
-   {
-      strcpy( message, "Your tile_for_point arguments are bogus!" );
-      return 1;
-   }
-
-   return 0;
-}
-
-void tile_for_point_deinit(UDF_INIT *initid)
-{
-   return;
-}
-
-long long tile_for_point(UDF_INIT *initid, UDF_ARGS *args, char *is_null, char *error)
-{
-   long long lat = *(long long *)args->args[0];
-   long long lon = *(long long *)args->args[1];
-
-   return xy2tile(lon2x(lon / 10000000.0), lat2y(lat / 10000000.0));
-}
-#endif
-
-#ifdef USE_PGSQL
-#ifdef USE_MYSQL
-#error ONLY one of USE_MYSQL and USE_PGSQL should be defined
-#endif
-
 #include <postgres.h>
 #include <fmgr.h>
 
@@ -73,4 +24,6 @@ PG_FUNCTION_INFO_V1(tile_for_point);
  * (without all the *s)
  */
 
+#ifdef PG_MODULE_MAGIC
+PG_MODULE_MAGIC;
 #endif