forked from enlightenment/efl
fix compilation of epp on Windows, plus minor formatting
SVN revision: 57947
This commit is contained in:
parent
a57f001e62
commit
eeb6d1dcc6
|
@ -316,7 +316,7 @@ fi
|
||||||
|
|
||||||
|
|
||||||
### Checks for header files
|
### Checks for header files
|
||||||
AC_CHECK_HEADERS([locale.h])
|
AC_CHECK_HEADERS([locale.h sys/resource.h])
|
||||||
|
|
||||||
EFL_CHECK_PATH_MAX
|
EFL_CHECK_PATH_MAX
|
||||||
|
|
||||||
|
|
|
@ -38,6 +38,7 @@ epp_CPPFLAGS = \
|
||||||
$(CWARNFLAGS)
|
$(CWARNFLAGS)
|
||||||
|
|
||||||
DEFS= \
|
DEFS= \
|
||||||
|
-DHAVE_CONFIG_H \
|
||||||
-DHAVE_STRERROR \
|
-DHAVE_STRERROR \
|
||||||
-DFATAL_EXIT_CODE=1 \
|
-DFATAL_EXIT_CODE=1 \
|
||||||
-DSUCCESS_EXIT_CODE=0 \
|
-DSUCCESS_EXIT_CODE=0 \
|
||||||
|
|
|
@ -23,8 +23,12 @@
|
||||||
* You are forbidden to forbid anyone else to use, share and improve
|
* You are forbidden to forbid anyone else to use, share and improve
|
||||||
* what you give them. Help stamp out software-hoarding! */
|
* what you give them. Help stamp out software-hoarding! */
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# include <config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "config.h"
|
|
||||||
#include "cpplib.h"
|
#include "cpplib.h"
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -23,9 +23,13 @@
|
||||||
* You are forbidden to forbid anyone else to use, share and improve
|
* You are forbidden to forbid anyone else to use, share and improve
|
||||||
* what you give them. Help stamp out software-hoarding! */
|
* what you give them. Help stamp out software-hoarding! */
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# include <config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "config.h"
|
|
||||||
#include "cpplib.h"
|
#include "cpplib.h"
|
||||||
|
|
||||||
/* Print the file names and line numbers of the #include
|
/* Print the file names and line numbers of the #include
|
||||||
|
|
|
@ -24,22 +24,25 @@
|
||||||
|
|
||||||
/* Parse a C expression from text in a string */
|
/* Parse a C expression from text in a string */
|
||||||
|
|
||||||
#include "config.h"
|
#ifdef HAVE_CONFIG_H
|
||||||
#include "cpplib.h"
|
# include <config.h>
|
||||||
#include "cpphash.h"
|
#endif
|
||||||
|
|
||||||
#ifdef __EMX__
|
#ifdef __EMX__
|
||||||
#include <strings.h>
|
# include <strings.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef MULTIBYTE_CHARS
|
#ifdef MULTIBYTE_CHARS
|
||||||
#include <locale.h>
|
# include <locale.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
#include "cpplib.h"
|
||||||
|
#include "cpphash.h"
|
||||||
|
|
||||||
/* This is used for communicating lists of keywords with cccp.c. */
|
/* This is used for communicating lists of keywords with cccp.c. */
|
||||||
struct arglist {
|
struct arglist {
|
||||||
struct arglist *next;
|
struct arglist *next;
|
||||||
|
|
|
@ -23,15 +23,18 @@
|
||||||
* You are forbidden to forbid anyone else to use, share and improve
|
* You are forbidden to forbid anyone else to use, share and improve
|
||||||
* what you give them. Help stamp out software-hoarding! */
|
* what you give them. Help stamp out software-hoarding! */
|
||||||
|
|
||||||
#include "config.h"
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# include <config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "cpplib.h"
|
#include "cpplib.h"
|
||||||
#include "cpphash.h"
|
#include "cpphash.h"
|
||||||
|
|
||||||
static HASHNODE *hashtab[HASHSIZE];
|
static HASHNODE *hashtab[HASHSIZE];
|
||||||
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
#define IS_IDCHAR(ch) is_idchar[(unsigned char)(ch)]
|
#define IS_IDCHAR(ch) is_idchar[(unsigned char)(ch)]
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -23,9 +23,23 @@
|
||||||
* You are forbidden to forbid anyone else to use, share and improve
|
* You are forbidden to forbid anyone else to use, share and improve
|
||||||
* what you give them. Help stamp out software-hoarding! */
|
* what you give them. Help stamp out software-hoarding! */
|
||||||
|
|
||||||
const char *version_string = "0.0.0";
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# include <config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "config.h"
|
#ifdef HAVE_ALLOCA_H
|
||||||
|
# include <alloca.h>
|
||||||
|
#elif defined __GNUC__
|
||||||
|
# define alloca __builtin_alloca
|
||||||
|
#elif defined _AIX
|
||||||
|
# define alloca __alloca
|
||||||
|
#elif defined _MSC_VER
|
||||||
|
# include <malloc.h>
|
||||||
|
# define alloca _alloca
|
||||||
|
#else
|
||||||
|
# include <stddef.h>
|
||||||
|
void *alloca (size_t);
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef __EMX__
|
#ifdef __EMX__
|
||||||
#include <strings.h>
|
#include <strings.h>
|
||||||
|
@ -42,6 +56,8 @@ const char *version_string = "0.0.0";
|
||||||
#include "cpplib.h"
|
#include "cpplib.h"
|
||||||
#include "cpphash.h"
|
#include "cpphash.h"
|
||||||
|
|
||||||
|
const char *version_string = "0.0.0";
|
||||||
|
|
||||||
#ifndef STDC_VALUE
|
#ifndef STDC_VALUE
|
||||||
#define STDC_VALUE 1
|
#define STDC_VALUE 1
|
||||||
#endif
|
#endif
|
||||||
|
@ -55,12 +71,7 @@ const char *version_string = "0.0.0";
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#ifdef __STDC__
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#endif
|
|
||||||
#ifdef HAVE_ALLOCA_H
|
|
||||||
#include <alloca.h>
|
|
||||||
#endif
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
@ -71,7 +82,9 @@ const char *version_string = "0.0.0";
|
||||||
#ifndef USG
|
#ifndef USG
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <sys/time.h> /* for __DATE__ and __TIME__ */
|
#include <sys/time.h> /* for __DATE__ and __TIME__ */
|
||||||
#include <sys/resource.h>
|
#ifdef HAVE_SYS_RESOURCE_H
|
||||||
|
# include <sys/resource.h>
|
||||||
|
#endif
|
||||||
#else
|
#else
|
||||||
#include <sys/param.h> /* CYGNUS LOCAL: shebs -noquiet */
|
#include <sys/param.h> /* CYGNUS LOCAL: shebs -noquiet */
|
||||||
#include <sys/times.h>
|
#include <sys/times.h>
|
||||||
|
|
|
@ -21,11 +21,14 @@
|
||||||
* You are forbidden to forbid anyone else to use, share and improve
|
* You are forbidden to forbid anyone else to use, share and improve
|
||||||
* what you give them. Help stamp out software-hoarding! */
|
* what you give them. Help stamp out software-hoarding! */
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# include <config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
#include "cpplib.h"
|
#include "cpplib.h"
|
||||||
|
|
||||||
#define EPP_DEBUG 0
|
#define EPP_DEBUG 0
|
||||||
|
|
Loading…
Reference in New Issue