nemiver r813 - in branches/0.5: . src/common src/dbgengine src/uicommon

[dodji svn gnome org]

Author: dodji
Date: Wed May  7 06:50:23 2008
New Revision: 813
URL: http://svn.gnome.org/viewvc/nemiver?rev=813&view=rev

Log:
Port nemiver to FreeBSD.
patche set from Romain TartiÃre <romain blogreen org>.

Command line is:
svn merge -r800:805 svn+ssh://svn.gnome.org/svn/nemiver/trunk



Modified:
   branches/0.5/ChangeLog
   branches/0.5/src/common/nmv-log-stream-utils.h
   branches/0.5/src/common/nmv-proc-utils.cc
   branches/0.5/src/common/nmv-ustring.cc
   branches/0.5/src/dbgengine/nmv-gdb-engine.cc
   branches/0.5/src/uicommon/nmv-terminal.cc

Modified: branches/0.5/src/common/nmv-log-stream-utils.h
==============================================================================
--- branches/0.5/src/common/nmv-log-stream-utils.h	(original)
+++ branches/0.5/src/common/nmv-log-stream-utils.h	Wed May  7 06:50:23 2008
@@ -35,6 +35,10 @@
 #include "nmv-log-stream.h"
 #include "nmv-scope-logger.h"
 
+#ifndef __ASSERT_FUNCTION
+#define __ASSERT_FUNCTION __PRETTY_FUNCTION__
+#endif
+
 #ifndef HERE
 #define HERE __ASSERT_FUNCTION << ":" <<__FILE__<< ":" << __LINE__ << ":"
 #endif

Modified: branches/0.5/src/common/nmv-proc-utils.cc
==============================================================================
--- branches/0.5/src/common/nmv-proc-utils.cc	(original)
+++ branches/0.5/src/common/nmv-proc-utils.cc	Wed May  7 06:50:23 2008
@@ -27,7 +27,13 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <pty.h>
+#if defined(_GNU_SOURCE)
+# include <pty.h>
+#elif defined(__FreeBSD__)
+# include <sys/types.h>
+# include <sys/ioctl.h>
+# include <libutil.h>
+#endif
 #include <termios.h>
 #include <vector>
 #include <memory>
@@ -36,6 +42,10 @@
 #include "nmv-exception.h"
 #include "nmv-log-stream-utils.h"
 
+#if defined(__FreeBSD__) && !defined(__MAX_BAUD)
+# define __MAX_BAUD B38400
+#endif
+
 namespace nemiver {
 namespace common {
 

Modified: branches/0.5/src/common/nmv-ustring.cc
==============================================================================
--- branches/0.5/src/common/nmv-ustring.cc	(original)
+++ branches/0.5/src/common/nmv-ustring.cc	Wed May  7 06:50:23 2008
@@ -38,6 +38,18 @@
 NEMIVER_BEGIN_NAMESPACE (nemiver)
 NEMIVER_BEGIN_NAMESPACE (common)
 
+#if defined(__FreeBSD__)
+int
+strnlen (const gchar *string, gulong a_len)
+{
+  gchar *pos = (gchar*) memchr ((void*)string, '\0', a_len);
+  if (pos)
+    return (pos - string);
+  else
+    return (a_len);
+}
+#endif
+
 UString
 UString::from_int (long long an_int)
 {

Modified: branches/0.5/src/dbgengine/nmv-gdb-engine.cc
==============================================================================
--- branches/0.5/src/dbgengine/nmv-gdb-engine.cc	(original)
+++ branches/0.5/src/dbgengine/nmv-gdb-engine.cc	Wed May  7 06:50:23 2008
@@ -28,7 +28,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <pty.h>
 #include <termios.h>
 #include <sstream>
 #include <boost/variant.hpp>

Modified: branches/0.5/src/uicommon/nmv-terminal.cc
==============================================================================
--- branches/0.5/src/uicommon/nmv-terminal.cc	(original)
+++ branches/0.5/src/uicommon/nmv-terminal.cc	Wed May  7 06:50:23 2008
@@ -23,7 +23,14 @@
  *See COPYRIGHT file copyright information.
  */
 #include "nmv-terminal.h"
-#include <pty.h>
+#if !defined(__FreeBSD__)
+# include <pty.h>
+#else
+# include <sys/types.h>
+# include <sys/ioctl.h>
+# include <termios.h>
+# include <libutil.h>
+#endif
 #include <iostream>
 #include <gtkmm/bin.h>
 #include <gtkmm/main.h>