3 files changed, 11 insertions, 6 deletions
diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk
index e86276e6744a..0233ce24dbf4 100644
--- a/external/firebird/UnpackedTarball_firebird.mk
+++ b/external/firebird/UnpackedTarball_firebird.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\
     external/firebird/msvc.patch \
     external/firebird/wnt-per-process-trace-storage.patch.1 \
     external/firebird/0001-extern-cloop-Missing-dependencies-of-compilations-on.patch.1 \
-    external/firebird/configure-include.patch \
+    external/firebird/configure-c99.patch \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/external/firebird/configure-include.patch b/external/firebird/configure-c99.patch
index fe2935f139d7..f582d383e5f0 100644
--- a/external/firebird/configure-include.patch
+++ b/external/firebird/configure-c99.patch
@@ -1,18 +1,23 @@
 --- configure
 +++ configure
-@@ -21478,6 +21478,7 @@
+@@ -21478,8 +21478,9 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 +#include <stdlib.h>
  #include <semaphore.h>
- main () {
+-main () {
++int main () {
    struct s {
-@@ -21514,6 +21515,7 @@
+     char a;
+     union { long long x; sem_t y; } b;
+@@ -21514,7 +21515,8 @@
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
+-main () {
 +#include <stdlib.h>
- main () {
++int main () {
    struct s {
      char a;
+     double b;
diff --git a/external/firebird/firebird-cygwin-msvc.patch b/external/firebird/firebird-cygwin-msvc.patch
index a19a2798f405..c59c614ba5da 100644
--- a/external/firebird/firebird-cygwin-msvc.patch
+++ b/external/firebird/firebird-cygwin-msvc.patch
@@ -34,7 +34,7 @@
  /* end confdefs.h.  */
  #include <stdlib.h>
 -#include <semaphore.h>
- main () {
+ int main () {
    struct s {
      char a;
 -    union { long long x; sem_t y; } b;