From cf6139db36112e49a83eda101846e101f6f65e40 Mon Sep 17 00:00:00 2001 From: michael Date: Thu, 7 May 2015 18:56:21 +0000 Subject: [PATCH] - Moved malloc.c to memory.c git-svn-id: svn://svn.ircd-hybrid.org/svnroot/hopm/branches/1.0.x@5946 82007160-df01-0410-b94d-b575c5fd34c7 --- configure | 2 +- src/libopm/src/Makefile.am | 4 ++-- src/libopm/src/Makefile.in | 8 ++++---- src/libopm/src/config.c | 2 +- src/libopm/src/libopm.c | 2 +- src/libopm/src/list.c | 2 +- src/libopm/src/{malloc.c => memory.c} | 2 +- src/libopm/src/{malloc.h => memory.h} | 0 8 files changed, 11 insertions(+), 11 deletions(-) rename src/libopm/src/{malloc.c => memory.c} (98%) rename src/libopm/src/{malloc.h => memory.h} (100%) diff --git a/configure b/configure index d8d141a..8bf374c 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Id: configure.ac 5715 2015-03-17 19:08:34Z michael . +# From configure.ac Id: configure.ac 5944 2015-05-06 19:10:11Z michael . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for hopm 1.0.5. # diff --git a/src/libopm/src/Makefile.am b/src/libopm/src/Makefile.am index 184b8a2..a4ce852 100644 --- a/src/libopm/src/Makefile.am +++ b/src/libopm/src/Makefile.am @@ -7,8 +7,8 @@ libopm_la_SOURCES = config.c \ libopm.h \ list.c \ list.h \ - malloc.c \ - malloc.h \ + memory.c \ + memory.h \ opm_common.h \ opm_error.h \ opm.h \ diff --git a/src/libopm/src/Makefile.in b/src/libopm/src/Makefile.in index 1cbdc78..6061b1f 100644 --- a/src/libopm/src/Makefile.in +++ b/src/libopm/src/Makefile.in @@ -100,7 +100,7 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) libopm_la_DEPENDENCIES = @LTLIBOBJS@ -am_libopm_la_OBJECTS = config.lo libopm.lo list.lo malloc.lo proxy.lo +am_libopm_la_OBJECTS = config.lo libopm.lo list.lo memory.lo proxy.lo libopm_la_OBJECTS = $(am_libopm_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -298,8 +298,8 @@ libopm_la_SOURCES = config.c \ libopm.h \ list.c \ list.h \ - malloc.c \ - malloc.h \ + memory.c \ + memory.h \ opm_common.h \ opm_error.h \ opm.h \ @@ -365,7 +365,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/config.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libopm.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/malloc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memory.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/proxy.Plo@am__quote@ .c.o: diff --git a/src/libopm/src/config.c b/src/libopm/src/config.c index bcb82b0..7cc5f59 100644 --- a/src/libopm/src/config.c +++ b/src/libopm/src/config.c @@ -25,7 +25,7 @@ #include -#include "malloc.h" +#include "memory.h" #include "config.h" #include "inet.h" #include "opm_error.h" diff --git a/src/libopm/src/libopm.c b/src/libopm/src/libopm.c index 817b768..bd5b1b2 100644 --- a/src/libopm/src/libopm.c +++ b/src/libopm/src/libopm.c @@ -25,7 +25,7 @@ #include "config.h" #include "libopm.h" -#include "malloc.h" +#include "memory.h" #include "opm_error.h" #include "opm_types.h" #include "opm_common.h" diff --git a/src/libopm/src/list.c b/src/libopm/src/list.c index 8e0a72d..5fd707a 100644 --- a/src/libopm/src/list.c +++ b/src/libopm/src/list.c @@ -25,7 +25,7 @@ #include "opm_common.h" #include "list.h" -#include "malloc.h" +#include "memory.h" #include "opm.h" diff --git a/src/libopm/src/malloc.c b/src/libopm/src/memory.c similarity index 98% rename from src/libopm/src/malloc.c rename to src/libopm/src/memory.c index f7988b4..569a526 100644 --- a/src/libopm/src/malloc.c +++ b/src/libopm/src/memory.c @@ -25,7 +25,7 @@ #include #include "setup.h" -#include "malloc.h" +#include "memory.h" #include "opm.h" diff --git a/src/libopm/src/malloc.h b/src/libopm/src/memory.h similarity index 100% rename from src/libopm/src/malloc.h rename to src/libopm/src/memory.h -- 2.30.2