Backpatch of 7a58d19b0 to 9.4, previously omitted.

Apparently by accident the above commit was backpatched to all supported
branches, except 9.4. This appears to be an error, as the issue is just
as present there.
Given the short amount of time before the next minor release, and given
the issue is documented to be fixed for 9.4, it seems like a good idea
to push this now.

Original-Author: Michael Meskes
Discussion: 75DB81BEEA95B445AE6D576A0A5C9E9364CBC11F@BPXM05GP.gisp.nec.co.jp

diff --git a/src/interfaces/ecpg/include/datetime.h b/src/interfaces/ecpg/include/datetime.h
index e7d6d2144aa7af511a1aa070b6880f6410aabd98..9394a129f1b725520ec8c83d6b88f6388055b736 100644 (file)
--- a/src/interfaces/ecpg/include/datetime.h
+++ b/src/interfaces/ecpg/include/datetime.h
@@ -5,8 +5,8 @@
 
 #include 
 
-#ifndef _ECPGLIB_H             /* source created by ecpg which defines these
-                                * symbols */
+/* source created by ecpg which defines these symbols */
+#ifndef _ECPGLIB_H
 typedef timestamp dtime_t;
 typedef interval intrvl_t;
 #endif   /* ndef _ECPGLIB_H */

diff --git a/src/interfaces/ecpg/include/decimal.h b/src/interfaces/ecpg/include/decimal.h
index 7efed476932a2a7c6e6045d01fdd34e61807429a..11b02de8aef006cf47e31683d99f6232fe37866b 100644 (file)
--- a/src/interfaces/ecpg/include/decimal.h
+++ b/src/interfaces/ecpg/include/decimal.h
@@ -5,8 +5,8 @@
 
 #include 
 
-#ifndef _ECPGLIB_H             /* source created by ecpg which defines this
-                                * symbol */
+/* source created by ecpg which defines this */
+#ifndef _ECPGLIB_H
 typedef decimal dec_t;
 #endif   /* ndef _ECPGLIB_H */