Merge branch 'master' into openstreetbugs

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

diff --git a/db/functions/xid_to_int4.c b/db/functions/xid_to_int4.c
index 6863dfaca405de72bfe589e62cdccc5d2afc75ab..d654bf26942855a992a133c65c071247fbe03f22 100644 (file)
--- a/db/functions/xid_to_int4.c
+++ b/db/functions/xid_to_int4.c
@@ -1,14 +1,3 @@
-#ifndef USE_MYSQL
-#ifndef USE_PGSQL
-#error One of USE_MYSQL or USE_PGSQL must be defined
-#endif
-#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>
 
 #include <postgres.h>
 #include <fmgr.h>
 


@@ -26,5 +15,3 @@ int xid_to_int4(TransactionId xid)
  *
  * (without all the *s)
  */
  *
  * (without all the *s)
  */

-
-#endif