Minor code shuffling.

diff --git a/src/Include/Makefile.am b/src/Include/Makefile.am
index e2fd138f8cac29cde17ad309af8b729eec9b1c57..a0d205c61a164df2967c2edf8bbbf2374ef38668 100644 (file)
--- a/src/Include/Makefile.am
+++ b/src/Include/Makefile.am
@@ -5,7 +5,6 @@ EXTRA_DIST = \
        compiler.h \
        fg_callback.hxx \
        fg_constants.h \
-       fg_memory.h \
        fg_traits.hxx \
        fg_typedefs.h \
        fg_types.hxx \

diff --git a/src/Include/fg_memory.h b/src/Include/fg_memory.h
deleted file mode 100644 (file)
index 711eb10..0000000
--- a/src/Include/fg_memory.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// fg_memory.h -- memcpy/bcopy portability declarations
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//
-// $Id$
-
-
-#ifndef _FG_MEMORY_H
-#define _FG_MEMORY_H
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#ifdef HAVE_MEMCPY
-
-#  ifdef HAVE_MEMORY_H
-#    include <memory.h>
-#  endif
-
-#  define fgmemcmp            memcmp
-#  define fgmemcpy            memcpy
-#  define fgmemzero(dest,len) memset(dest,0,len)
-
-#elif defined(HAVE_BCOPY)
-
-#  define fgmemcmp              bcmp
-#  define fgmemcpy(dest,src,n)  bcopy(src,dest,n)
-#  define fgmemzero             bzero
-
-#else
-
-/* 
- * Neither memcpy() or bcopy() available.
- * Use substitutes provided be zlib.
- */
-
-#  include <zlib/zutil.h>
-#  define fgmemcmp zmemcmp
-#  define fgmemcpy zmemcpy
-#  define fgmemzero zmemzero
-
-#endif
-
-#endif // _FG_MEMORY_H
-
-