From 86c6e6f87dbf9e230df0e3535788ed09f5e00d4b Mon Sep 17 00:00:00 2001
From: Manish Singh <yosh@src.gnome.org>
Date: Tue, 2 Jun 1998 23:35:00 +0000
Subject: [PATCH] install gtkrc.forest2 in $prefix/share/gimp

* Makefile.am: install gtkrc.forest2 in $prefix/share/gimp

* plug-ins/CEL/CEL.c: change bzero to memset for portability

* plug-ins/gfli/fli.c: #include <glib.h> to get inline defintion

-Yosh
---
 ChangeLog             | 8 ++++++++
 Makefile.am           | 2 +-
 plug-ins/CEL/CEL.c    | 2 +-
 plug-ins/common/CEL.c | 2 +-
 plug-ins/gfli/fli.c   | 1 +
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4f341fd388..fced369455 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Jun  2 16:15:51 PDT 1998 Manish Singh <yosh@gimp.org>
+
+	* Makefile.am: install gtkrc.forest2 in $prefix/share/gimp
+
+	* plug-ins/CEL/CEL.c: change bzero to memset for portability
+
+	* plug-ins/gfli/fli.c: #include <glib.h> to get inline defintion
+
 Mon Jun  1 01:05:52 EDT 1998  Matthew Wilson  <msw@gimp.org>
 
 	* plug-ins/grid.c: fix a comment. :)
diff --git a/Makefile.am b/Makefile.am
index 03fdf8eb0b..cccc2d956d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ bin_SCRIPTS = gimptool
 
 EXTRA_DIST = TODO gtkrc gimp_logo.ppm gimp_splash.ppm rmshm user_install gimp_tips.txt ps-menurc gimp.1 gimptool.1 gtkrc.forest2
 
-gimpdata_DATA = gimprc gimprc_user gtkrc gimp_logo.ppm gimp_splash.ppm gimp_tips.txt ps-menurc
+gimpdata_DATA = gimprc gimprc_user gtkrc gimp_logo.ppm gimp_splash.ppm gimp_tips.txt ps-menurc gtkrc.forest2
 
 gimpdata_SCRIPTS = user_install
 
diff --git a/plug-ins/CEL/CEL.c b/plug-ins/CEL/CEL.c
index 554f6fb667..aaaba5e4be 100644
--- a/plug-ins/CEL/CEL.c
+++ b/plug-ins/CEL/CEL.c
@@ -408,7 +408,7 @@ static gint save_image(char *file, char *brief, gint32 image, gint32 layer) {
   gimp_progress_init(progress);
 
  /* Headers */
-  bzero(header, 32);
+  memset(header, 0, 32);
   strcpy(header, "KiSS");
   header[4]= 0x20;
 
diff --git a/plug-ins/common/CEL.c b/plug-ins/common/CEL.c
index 554f6fb667..aaaba5e4be 100644
--- a/plug-ins/common/CEL.c
+++ b/plug-ins/common/CEL.c
@@ -408,7 +408,7 @@ static gint save_image(char *file, char *brief, gint32 image, gint32 layer) {
   gimp_progress_init(progress);
 
  /* Headers */
-  bzero(header, 32);
+  memset(header, 0, 32);
   strcpy(header, "KiSS");
   header[4]= 0x20;
 
diff --git a/plug-ins/gfli/fli.c b/plug-ins/gfli/fli.c
index 1bd375dfc7..8e4e83f2fc 100644
--- a/plug-ins/gfli/fli.c
+++ b/plug-ins/gfli/fli.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <glib.h>
 
 #include "fli.h"