mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

* mem.h: Clean up obsolete definitions, incorporate into ...

Browse Source 
* global.h: ... this.
* Makefile.am: Remove mem.h.
This commit is contained in:
Pavel Roskin 2002-07-14 19:34:17 +00:00
parent a23618b2ef
commit 6ffc6bde22
4 changed files with 19 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2002-07-14 Pavel Roskin <proski@gnu.org>
* mem.h: Clean up obsolete definitions, incorporate into ...
* global.h: ... this.
* Makefile.am: Remove mem.h.
2002-07-13 Pavel Roskin <proski@gnu.org>
* Makefile.am (AM_CPPFLAGS): Remove REGEX_MALLOC, it's now in

2
src/Makefile.am
View File

@ -53,7 +53,7 @@ SRCS = achown.c achown.h background.c background.h boxes.c boxes.h \
findme.h fs.h fsusage.c fsusage.h global.h help.c help.h \
hotlist.c hotlist.h i18n.h info.c info.h key.c key.h keys.h \
keyxdef.c layout.c layout.h learn.c learn.h listmode.c \
listmode.h mad.c mad.h main.c main.h mem.h menu.c menu.h \
listmode.h mad.c mad.h main.c main.h menu.c menu.h \
mountlist.c mountlist.h mouse.c mouse.h myslang.h option.c \
option.h panel.h panelize.c panelize.h poptalloca.h popt.c \
poptconfig.c popt.h popthelp.c poptint.h poptparse.c profile.c \

13
src/global.h
View File

@ -8,6 +8,18 @@
#include <stdlib.h> /* for free() and other usefull routins */
#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
# include <string.h>
/* An ANSI string.h and pre-ANSI memory.h might conflict */
# if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H)
# include <memory.h>
# endif /* !STDC_HEADERS & HAVE_MEMORY_H */
#else /* !STDC_HEADERS & !HAVE_STRING_H */
# include <strings.h>
/* memory and strings.h conflict on other systems */
#endif /* !STDC_HEADERS & !HAVE_STRING_H */
#ifdef _OS_NT
# include <windows.h>
# include <io.h>
@ -89,7 +101,6 @@ struct timeval {
#endif
#include "fs.h"
#include "mem.h"
#include "util.h"
#include "mad.h"

33
src/mem.h
View File

@ -1,33 +0,0 @@
#ifndef __MEM_H
#define __MEM_H
#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
# include <string.h>
/* An ANSI string.h and pre-ANSI memory.h might conflict */
# if !defined(STDC_HEADERS) && defined(HAVE_MEMORY_H)
# include <memory.h>
# endif /* not STDC_HEADERS and HAVE_MEMORY_H */
# ifndef index
# define index strchr
# endif
# ifndef rindex
# define rindex strrchr
# endif
# undef bcopy
# define bcopy(s,d,n) memcpy ((d), (s), (n))
# undef bcmp
# define bcmp(s1,s2,n) memcmp ((s1), (s2), (n))
# undef bzero
# define bzero(s,n) memset ((s), 0, (n))
#else /* not STDC_HEADERS and not HAVE_STRING_H */
# include <strings.h>
/* memory and strings.h conflict on other systems */
#endif /* not STDC_HEADERS and not HAVE_STRING_H */
#endif /* __MEM_H */