[prev in list] [next in list] [prev in thread] [next in thread]
List: bacula-commits
Subject: [Bacula-commits] SF.net SVN: bacula:[7513] trunk/bacula
From: kerns () users ! sourceforge ! net
Date: 2008-08-27 21:11:07
Message-ID: E1KYSIF-0005PG-2j () bj8yhf1 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Revision: 7513
http://bacula.svn.sourceforge.net/bacula/?rev=7513&view=rev
Author: kerns
Date: 2008-08-27 21:11:04 +0000 (Wed, 27 Aug 2008)
Log Message:
-----------
kes Apply most of changes in a patch from:
Michael Stapelberg <michael+bacula@stapelberg.de>
that allow the Bacula FD to compile on IRIX 6.5.
Modified Paths:
--------------
trunk/bacula/src/bacula.h
trunk/bacula/src/console/authenticate.c
trunk/bacula/src/console/conio.c
trunk/bacula/src/findlib/attribs.c
trunk/bacula/src/lib/rblist.h
trunk/bacula/src/lib/smartall.h
trunk/bacula/technotes-2.5
Modified: trunk/bacula/src/bacula.h
===================================================================
--- trunk/bacula/src/bacula.h 2008-08-26 15:34:11 UTC (rev 7512)
+++ trunk/bacula/src/bacula.h 2008-08-27 21:11:04 UTC (rev 7513)
@@ -58,8 +58,10 @@
/* System includes */
#if HAVE_STDINT_H
+#ifndef __sgi
#include <stdint.h>
#endif
+#endif
#if HAVE_STDARG_H
#include <stdarg.h>
#endif
Modified: trunk/bacula/src/console/authenticate.c
===================================================================
--- trunk/bacula/src/console/authenticate.c 2008-08-26 15:34:11 UTC (rev 7512)
+++ trunk/bacula/src/console/authenticate.c 2008-08-27 21:11:04 UTC (rev 7513)
@@ -47,10 +47,10 @@
void sendit(const char *buf);
/* Commands sent to Director */
-static char hello[] = N_("Hello %s calling\n");
+static char hello[] = "Hello %s calling\n";
/* Response from Director */
-static char OKhello[] = N_("1000 OK:");
+static char OKhello[] = "1000 OK:";
/* Forward referenced functions */
Modified: trunk/bacula/src/console/conio.c
===================================================================
--- trunk/bacula/src/console/conio.c 2008-08-26 15:34:11 UTC (rev 7512)
+++ trunk/bacula/src/console/conio.c 2008-08-27 21:11:04 UTC (rev 7513)
@@ -72,6 +72,11 @@
#elif HAVE_AIX_OS
#include <curses.h>
#include <term.h>
+#elif defined(__sgi)
+extern "C" int tgetent(char *, char *);
+extern "C" int tgetnum(char id[2]);
+extern "C" char *tgetstr(char id[2], char **);
+extern "C" char *tgoto(char *, int, int);
#elif defined (__digital__) && defined (__unix__)
extern "C" int tgetent(void *, const char *);
extern "C" int tgetnum(const char *);
Modified: trunk/bacula/src/findlib/attribs.c
===================================================================
--- trunk/bacula/src/findlib/attribs.c 2008-08-26 15:34:11 UTC (rev 7512)
+++ trunk/bacula/src/findlib/attribs.c 2008-08-27 21:11:04 UTC (rev 7513)
@@ -226,6 +226,8 @@
#if !HAVE_GCC & HAVE_SUN_OS
/* Sun compiler does not handle templates correctly */
#define plug(st, val) st = val
+ #elif __sgi
+ #define plug(st, val) st = val
#else
/* Use templates to do the casting */
template <class T> void plug(T &st, uint64_t val)
Modified: trunk/bacula/src/lib/rblist.h
===================================================================
--- trunk/bacula/src/lib/rblist.h 2008-08-26 15:34:11 UTC (rev 7512)
+++ trunk/bacula/src/lib/rblist.h 2008-08-27 21:11:04 UTC (rev 7513)
@@ -93,16 +93,7 @@
void destroy(void);
};
-inline rblist::rblist(void *item, rblink *link)
-{
- init(item, link);
-}
-/* Constructor with link at head of item */
-inline rblist::rblist(void): head(0), loffset(0), num_items(0)
-{
-}
-
/*
* This allows us to do explicit initialization,
* allowing us to mix C++ classes inside malloc'ed
@@ -118,6 +109,16 @@
num_items = 0;
}
+inline rblist::rblist(void *item, rblink *link)
+{
+ init(item, link);
+}
+
+/* Constructor with link at head of item */
+inline rblist::rblist(void): head(0), loffset(0), num_items(0)
+{
+}
+
inline void rblist::set_parent(void *item, void *parent)
{
((rblink *)(((char *)item)+loffset))->parent = parent;
Modified: trunk/bacula/src/lib/smartall.h
===================================================================
--- trunk/bacula/src/lib/smartall.h 2008-08-26 15:34:11 UTC (rev 7512)
+++ trunk/bacula/src/lib/smartall.h 2008-08-27 21:11:04 UTC (rev 7513)
@@ -20,7 +20,7 @@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Bacula ® is a registered trademark ofJohn Walker.
+ Bacula ® is a registered trademark of Kern Sibbald.
The licensor of Bacula is the Free Software Foundation Europe
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
@@ -99,7 +99,6 @@
#endif
#ifdef SMARTALLOC
-// #ifdef xxx
#define New(type) new(__FILE__, __LINE__) type
@@ -121,20 +120,17 @@
{
free(ptr);
}
-void operator delete[](void *ptr, size_t i)
+void operator delete[](void *ptr, size_t /*i*/)
{
- (void)i; /* eliminate compiler complaints */
free(ptr);
}
-void operator delete(void *ptr, const char *fname, int line)
+void operator delete(void *ptr, const char * /*fname*/, int /*line*/)
{
- (void)fname; (void)line; /* eliminate compiler complaints */
free(ptr);
}
-void operator delete[](void *ptr, size_t i, const char *fname, int line)
+void operator delete[](void *ptr, size_t /*i*/, const char * /*fname*/, int \
/*line*/) {
- (void)i; (void)fname; (void)line; /* eliminate compiler complaints */
free(ptr);
}
Modified: trunk/bacula/technotes-2.5
===================================================================
--- trunk/bacula/technotes-2.5 2008-08-26 15:34:11 UTC (rev 7512)
+++ trunk/bacula/technotes-2.5 2008-08-27 21:11:04 UTC (rev 7513)
@@ -32,6 +32,10 @@
General:
+27Aug08
+kes Apply most of changes in a patch from:
+ Michael Stapelberg <michael+bacula@stapelberg.de>
+ that allow the Bacula FD to compile on IRIX 6.5.
26Aug08
kes Apply patch from Bastian Friedrich that accepts a yes on a
delete volume command line.
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Bacula-commits mailing list
Bacula-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bacula-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic