parent
28386ab272
commit
e1bfe5ea0d
|
@ -28,9 +28,6 @@
|
||||||
#include "cpplib.h"
|
#include "cpplib.h"
|
||||||
#include "cpphash.h"
|
#include "cpphash.h"
|
||||||
|
|
||||||
#ifdef __EMX__
|
|
||||||
#include <strings.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef MULTIBYTE_CHARS
|
#ifdef MULTIBYTE_CHARS
|
||||||
#include <locale.h>
|
#include <locale.h>
|
||||||
|
|
11
epp/cpplib.c
11
epp/cpplib.c
|
@ -27,9 +27,6 @@ const char *version_string = "0.0.0";
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#ifdef __EMX__
|
|
||||||
#include <strings.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef STANDARD_INCLUDE_DIR
|
#ifndef STANDARD_INCLUDE_DIR
|
||||||
#define STANDARD_INCLUDE_DIR "/usr/include"
|
#define STANDARD_INCLUDE_DIR "/usr/include"
|
||||||
|
@ -3320,11 +3317,7 @@ do_include(cpp_reader * pfile, struct directive *keyword,
|
||||||
|
|
||||||
/* If specified file name is absolute, just open it. */
|
/* If specified file name is absolute, just open it. */
|
||||||
|
|
||||||
#ifndef __EMX__
|
|
||||||
if (*fbeg == '/')
|
if (*fbeg == '/')
|
||||||
#else
|
|
||||||
if (_fnisabs(fbeg))
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
strncpy(fname, (const char *)fbeg, flen);
|
strncpy(fname, (const char *)fbeg, flen);
|
||||||
fname[flen] = 0;
|
fname[flen] = 0;
|
||||||
|
@ -5380,11 +5373,7 @@ read_name_map(cpp_reader * pfile, const char *dirname)
|
||||||
if (*dirname)
|
if (*dirname)
|
||||||
strcat(name, "/");
|
strcat(name, "/");
|
||||||
strcat(name, FILE_NAME_MAP_FILE);
|
strcat(name, FILE_NAME_MAP_FILE);
|
||||||
#ifndef __EMX__
|
|
||||||
f = fopen(name, "r");
|
f = fopen(name, "r");
|
||||||
#else
|
|
||||||
f = fopen(name, "rt");
|
|
||||||
#endif
|
|
||||||
if (!f)
|
if (!f)
|
||||||
map_list_ptr->map_list_map = NULL;
|
map_list_ptr->map_list_map = NULL;
|
||||||
else
|
else
|
||||||
|
|
|
@ -636,6 +636,3 @@ void *xmalloc(unsigned size);
|
||||||
void *xrealloc(void *old, unsigned size);
|
void *xrealloc(void *old, unsigned size);
|
||||||
void *xcalloc(unsigned number, unsigned size);
|
void *xcalloc(unsigned number, unsigned size);
|
||||||
|
|
||||||
#ifdef __EMX__
|
|
||||||
#define PATH_SEPARATOR ';'
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -44,11 +44,7 @@ main(int argc, char **argv)
|
||||||
int got_text;
|
int got_text;
|
||||||
|
|
||||||
p = argv[0] + strlen(argv[0]);
|
p = argv[0] + strlen(argv[0]);
|
||||||
#ifndef __EMX__
|
|
||||||
while (p != argv[0] && p[-1] != '/')
|
while (p != argv[0] && p[-1] != '/')
|
||||||
#else
|
|
||||||
while (p != argv[0] && p[-1] != '/' && p[-1] != '\\')
|
|
||||||
#endif
|
|
||||||
--p;
|
--p;
|
||||||
progname = p;
|
progname = p;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue