Remove jit/jit-memory.h

diff --git a/ChangeLog b/ChangeLog
index 90fa0bbfdcdcbf5aa6e968132507c64cd6cad116..fc82e38289b8978befe1fba686dca6a25121f084 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-12  Aleksey Demakov  <ademakov@gmail.com>
+
+       * jit/jit-memory.h: remove file.
+
 2012-10-08  Aleksey Demakov  <ademakov@gmail.com>
 
        * jit/jit-cache.c, jit/jit-cache.c(_jit_cache_alloc_trampoline)

diff --git a/jit/Makefile.am b/jit/Makefile.am
index df7b0abbe1ccdd7b451e0231f2840f9ae2ce5b0b..f0ee3f64d45431d90938540155f8be85be05276f 100644 (file)
--- a/jit/Makefile.am
+++ b/jit/Makefile.am
@@ -46,7 +46,6 @@ libjit_la_SOURCES = \
        jit-intrinsic.c \
        jit-live.c \
        jit-memory.c \
-       jit-memory.h \
        jit-meta.c \
        jit-opcode-apply.c \
        jit-objmodel.c \

diff --git a/jit/jit-apply.c b/jit/jit-apply.c
index 4ace8668377e6364306bb657682549d258630c87..4d5331c82cc79d9069906ff71eda47193ce3f375 100644 (file)
--- a/jit/jit-apply.c
+++ b/jit/jit-apply.c
@@ -21,7 +21,6 @@
  */
 
 #include "jit-internal.h"
-#include "jit-memory.h"
 #include "jit-apply-rules.h"
 #include "jit-apply-func.h"
 #include "jit-cache.h"

diff --git a/jit/jit-block.c b/jit/jit-block.c
index f5c363a9f2fe38b42947bd079983a119a59aa6d9..939e96999de50ff10fda55ad83be9df401f77af2 100644 (file)
--- a/jit/jit-block.c
+++ b/jit/jit-block.c
@@ -21,7 +21,6 @@
  */
 
 #include "jit-internal.h"
-#include "jit-memory.h"
 
 /*@
 

diff --git a/jit/jit-compile.c b/jit/jit-compile.c
index 3c648c9d203f7be4a8e0d14fa5375d8ecac4cbcb..40860f39ee207027a460babdfc65141bc6e23714 100644 (file)
--- a/jit/jit-compile.c
+++ b/jit/jit-compile.c
@@ -21,7 +21,6 @@
  */
 
 #include "jit-internal.h"
-#include "jit-memory.h"
 #include "jit-rules.h"
 #include "jit-reg-alloc.h"
 #include "jit-setjmp.h"

diff --git a/jit/jit-elf-read.c b/jit/jit-elf-read.c
index cb1cf4011d370cb68eef7aaeac4087a0f27bf583..a2bca7d330c4a3722218fefe5b7ab9c848e28739 100644 (file)
--- a/jit/jit-elf-read.c
+++ b/jit/jit-elf-read.c
@@ -23,7 +23,6 @@
 #include "jit-internal.h"
 #include "jit-rules.h"
 #include "jit-elf-defs.h"
-#include "jit-memory.h"
 #ifdef JIT_WIN32_PLATFORM
        #ifdef HAVE_SYS_TYPES_H
                #include <sys/types.h>

diff --git a/jit/jit-elf-write.c b/jit/jit-elf-write.c
index 9876dfc74ed8b59410da02e132fa58a702711cea..7b9c94e012fc0d1b8b9172f3b354930d0e472f21 100644 (file)
--- a/jit/jit-elf-write.c
+++ b/jit/jit-elf-write.c
@@ -22,7 +22,6 @@
 
 #include "jit-internal.h"
 #include "jit-elf-defs.h"
-#include "jit-memory.h"
 #include "jit-rules.h"
 
 /*@

diff --git a/jit/jit-internal.h b/jit/jit-internal.h
index da59e4cbae674560a85dc63a8a130c9864001cac..1b52dd88225de55b841612fb088c492b64d54b7b 100644 (file)
--- a/jit/jit-internal.h
+++ b/jit/jit-internal.h
@@ -26,6 +26,42 @@
 #include <jit/jit.h>
 #include "jit-config.h"
 
+#if defined(HAVE_STRING_H)
+# include <string.h>
+#elif defined(HAVE_STRINGS_H)
+# include <strings.h>
+#endif
+#if defined(HAVE_MEMORY_H)
+# include <memory.h>
+#endif
+
+/*
+ * Macros that replace the routines in <jit/jit-util.h>
+ * with direct calls on the underlying library functions.
+ */
+#if defined(HAVE_MEMSET)
+# define jit_memset(s, c, len)         (memset((s), (c), (len)))
+# define jit_memzero(s, len)           (memset((s), 0, (len)))
+#elif defined(HAVE_BZERO)
+# define jit_memzero(s, len)           (bzero((char *)(s), (len)))
+#else
+# define jit_memzero(s, len)           (jit_memset((char *)(s), 0, (len)))
+#endif
+#if defined(HAVE_MEMCPY)
+# define jit_memcpy(s1, s2, len)       (memcpy((s1), (s2), (len)))
+#endif
+#if defined(HAVE_MEMMOVE)
+# define jit_memmove(s1, s2, len)      (memmove((s1), (s2), (len)))
+#endif
+#if defined(HAVE_MEMCMP)
+# define jit_memcmp(s1, s2, len)       (memcmp((s1), (s2), (len)))
+#elif defined(HAVE_BCMP)
+# define jit_memcmp(s1, s2, len)       (bcmp((char *)(s1), (char *)(s2), (len)))
+#endif
+#if defined(HAVE_MEMCHR)
+# define jit_memchr(s, c, len)         (memchr((s), (c), (len)))
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/jit/jit-interp.c b/jit/jit-interp.c
index 0e11df4284f0cd45d2854f1717456cb295aa89d2..99904d9d52c3f2d3598f2c3c0835e38a9383f985 100644 (file)
--- a/jit/jit-interp.c
+++ b/jit/jit-interp.c
@@ -30,7 +30,6 @@ straight vanilla ANSI C.
 
 #include "jit-interp.h"
 #include "jit-rules.h"
-#include "jit-memory.h"
 #if HAVE_STDLIB_H
        #include <stdlib.h>
 #endif

diff --git a/jit/jit-memory.c b/jit/jit-memory.c
index be6692b57be33cb23ca899da6bd74c9e28a81590..662ea2bcfb5928c0a06165f191b132b9e3004b1e 100644 (file)
--- a/jit/jit-memory.c
+++ b/jit/jit-memory.c
@@ -20,10 +20,10 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#include "jit-memory.h"
+#include "jit-internal.h"
 
 /*
- * Undefine the macros in "jit-memory.h" so that we
+ * Undefine the macros in "jit-internal.h" so that we
  * can define the real function forms.
  */
 #undef jit_memset

diff --git a/jit/jit-memory.h b/jit/jit-memory.h
deleted file mode 100644 (file)
index 6773b21..0000000
--- a/jit/jit-memory.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * jit-memory.h - Memory copy/set/compare routines.
- *
- * Copyright (C) 2004  Southern Storm Software, Pty Ltd.
- *
- * This file is part of the libjit library.
- *
- * The libjit library is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation, either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * The libjit library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the libjit library.  If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-#ifndef        _JIT_MEMORY_H
-#define        _JIT_MEMORY_H
-
-#include <config.h>
-#ifdef HAVE_STRING_H
-       #include <string.h>
-#else
-       #ifdef HAVE_STRINGS_H
-               #include <strings.h>
-       #endif
-#endif
-#ifdef HAVE_MEMORY_H
-       #include <memory.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Macros that replace the routines in <jit/jit-util.h>
- * with direct calls on the underlying library functions.
- */
-#ifdef HAVE_MEMSET
-       #define jit_memset(dest,ch,len) (memset((dest), (ch), (len)))
-       #define jit_memzero(dest,len)   (memset((dest), 0, (len)))
-#else
-       #ifdef HAVE_BZERO
-               #define jit_memzero(dest,len)   (bzero((char *)(dest), (len)))
-       #else
-               #define jit_memzero(dest,len)   (jit_memset((char *)(dest), 0, (len)))
-       #endif
-#endif
-#ifdef HAVE_MEMCPY
-       #define jit_memcpy(dest,src,len)        (memcpy((dest), (src), (len)))
-#endif
-#ifdef HAVE_MEMMOVE
-       #define jit_memmove(dest,src,len)       (memmove((dest), (src), (len)))
-#endif
-#ifdef HAVE_MEMCMP
-       #define jit_memcmp(s1,s2,len)           (memcmp((s1), (s2), (len)))
-#else
-       #ifdef HAVE_BCMP
-               #define jit_memcmp(s1,s2,len)   \
-                                       (bcmp((char *)(s1), (char *)(s2), (len)))
-       #endif
-#endif
-#ifdef HAVE_MEMCHR
-       #define jit_memchr(str,ch,len)  (memchr((str), (ch), (len)))
-#endif
-
-#ifdef __cplusplus
-};
-#endif
-
-#endif /* _JIT_MEMORY_H */

diff --git a/jit/jit-pool.c b/jit/jit-pool.c
index af0979471dcd0d0557f103286d29cbfde97b0a3a..acadcca1e0b165aca6e45716918ecd129fcc041c 100644 (file)
--- a/jit/jit-pool.c
+++ b/jit/jit-pool.c
@@ -21,7 +21,6 @@
  */
 
 #include "jit-internal.h"
-#include "jit-memory.h"
 
 void _jit_memory_pool_init(jit_memory_pool *pool, unsigned int elem_size)
 {