[Qemacs-commit] qemacs Makefile haiku.cpp

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        17/03/28 08:53:15

Modified files:
        .              : Makefile haiku.cpp 

Log message:
        haiku: merge patch by Francois Revol to compile with gcc5

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/Makefile?cvsroot=qemacs&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/qemacs/haiku.cpp?cvsroot=qemacs&r1=1.14&r2=1.15

Patches:
Index: Makefile
===================================================================
RCS file: /sources/qemacs/qemacs/Makefile,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- Makefile    25 Mar 2017 18:00:52 -0000      1.95
+++ Makefile    28 Mar 2017 12:53:15 -0000      1.96
@@ -91,7 +91,7 @@
 
 ifdef CONFIG_HAIKU
   OBJS += haiku.o
-  LIBS += -lbe
+  LIBS += -lbe -lstdc++
 endif
 
 ifdef CONFIG_WIN32

Index: haiku.cpp
===================================================================
RCS file: /sources/qemacs/qemacs/haiku.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- haiku.cpp   15 Mar 2017 07:24:31 -0000      1.14
+++ haiku.cpp   28 Mar 2017 12:53:15 -0000      1.15
@@ -329,7 +329,7 @@
     WindowState *ctx = (WindowState *)s->priv_data;
     ctx->w->Lock();
     ctx->w->Quit();
-    qe_free(&s->priv_data);
+    qe_free((WindowState **)&s->priv_data);
     uninit_application();
 }