[geany/geany-plugins] 106662: scope: fix building on GNU/Hurd (PR #146)

[Dimitar Zhekov]

Branch:      refs/heads/master
Author:      Dimitar Zhekov <dimitar.zhekov at gmail.com>
Committer:   Dimitar Zhekov <dimitar.zhekov at gmail.com>
Date:        Sun, 27 Apr 2014 12:30:48 UTC
Commit:      10666292f7bd0ceaee299a568ce5fe06b3bce254
             https://github.com/geany/geany-plugins/commit/10666292f7bd0ceaee299a568ce5fe06b3bce254

Log Message:
-----------
scope: fix building on GNU/Hurd (PR #146)


Modified Paths:
--------------
    scope/ChangeLog
    scope/src/conterm.c
    scope/src/program.c

Modified: scope/ChangeLog
9 lines changed, 9 insertions(+), 0 deletions(-)
===================================================================
@@ -1,3 +1,12 @@
+2014-04-27  Dimitar Zhekov  <dimitar.zhekov at gmail.com>
+
+ * src/conterm.c:
+   Declare unlockpt() and grantpt() prototypes instead of detecting
+   N kinds of *nix. Taken from the debugger plugin.
+ * src/program.c:
+   Define PATH_MAX if none (for example GNU/Hurd), by Evgeni Golov.
+
+
 2014-02-17  Dimitar Zhekov  <dimitar.zhekov at gmail.com>
 
  * src/store/scptreestore.c:


Modified: scope/src/conterm.c
15 lines changed, 4 insertions(+), 11 deletions(-)
===================================================================
@@ -17,8 +17,6 @@
  *  along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define _XOPEN_SOURCE 500 /* for openpty, grantpt and unlockpt */
-
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
@@ -30,16 +28,11 @@
 #define DS_COPY (DS_BASICS | DS_EXTRA_1)
 
 #ifdef G_OS_UNIX
-#if (defined(__unix__) || defined(unix)) && !defined(USG)
-#include <sys/param.h>
-#endif
-#ifdef BSD
-#include <termios.h>
-#include <libutil.h>
-#else
-#include <pty.h>
-#endif
 #include <vte/vte.h>
+/* instead of detecting N kinds of *nix */
+#include <pty.h>
+int grantpt(int fd);
+int unlockpt(int fd);
 
 static GtkWidget *program_window;
 static VteTerminal *program_terminal;


Modified: scope/src/program.c
4 lines changed, 4 insertions(+), 0 deletions(-)
===================================================================
@@ -23,6 +23,10 @@
 
 #include "common.h"
 
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
 static StashGroup *program_group;
 static StashGroup *options_group;
 static StashGroup *thread_group;



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).