- updated to 1.5.4.4910

[packages/Firebird.git] / Firebird-gcc4.patch

--- firebird-1.5.4.4910/src/common/classes/alloc.h.orig	2006-11-05 15:37:52.000000000 +0100
+++ firebird-1.5.4.4910/src/common/classes/alloc.h	2007-02-17 23:15:18.116389037 +0100
@@ -241,7 +241,7 @@
 
 void operator delete[](void* mem) throw();
 
-#ifdef AIX
+#if defined(AIX) || __GNUC__ >= 4
 #define FB_STATIC_INLINE_NEW inline
 #else
 #define FB_STATIC_INLINE_NEW static inline
--- firebird-1.5.4.4910/src/burp/burp.cpp.orig	2006-11-05 15:37:49.000000000 +0100
+++ firebird-1.5.4.4910/src/burp/burp.cpp	2007-02-17 23:46:15.538237476 +0100
@@ -1596,7 +1596,7 @@
 #ifndef WIN_NT
 				signal(SIGPIPE, SIG_IGN);
 #endif
-				fil->fil_fd = reinterpret_cast<DESC>(GBAK_STDOUT_DESC);
+				fil->fil_fd = static_cast<DESC>(GBAK_STDOUT_DESC);
 				break;
 			}
 			else
@@ -1714,7 +1714,7 @@
 
 	tdgbl->action->act_action = ACT_restore;
 	if (!strcmp(fil->fil_name, "stdin")) {
-		fil->fil_fd = reinterpret_cast<DESC>(GBAK_STDIN_DESC);
+		fil->fil_fd = static_cast<DESC>(GBAK_STDIN_DESC);
 		tdgbl->file_desc = fil->fil_fd;
 		tdgbl->gbl_sw_files = fil->fil_next;
 	}