Summary: first step for making Evil private. evil_private.h will be included in the EFL source code instead of Evil.h
Test Plan: compilation
Reviewers: raster, cedric, zmike
Reviewed By: raster
Subscribers: #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D8893
lib/evil/evil_fcntl.h \
lib/evil/evil_langinfo.h \
lib/evil/evil_locale.h \
-lib/evil/evil_macro.h \
-lib/evil/evil_macro_pop.h \
lib/evil/evil_macro_wrapper.h \
lib/evil/evil_main.h \
lib/evil/evil_stdio.h \
#endif
-#ifndef WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-
-#include <sys/stat.h> /* for mkdir in evil_macro_wrapper */
-
-
typedef unsigned long uid_t;
typedef unsigned long gid_t;
# define strdup(str) _strdup(str)
#endif
-
-#include "evil_macro.h"
-#include "evil_dlfcn.h"
-#include "evil_fcntl.h"
-#include "evil_langinfo.h"
-#include "evil_locale.h"
-#include "evil_main.h"
-#include "evil_stdlib.h"
-#include "evil_stdio.h"
-#include "evil_string.h"
-#include "evil_time.h"
-#include "evil_unistd.h"
-#include "evil_util.h"
-
#ifndef S_ISDIR
# define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR)
#endif
#define _S_IWUSR _S_IWRITE
#define _S_IRUSR _S_IREAD
-#define sigsetjmp(Env, Save) setjmp(Env)
-
-#include "evil_macro_wrapper.h"
-#include "evil_macro_pop.h"
+#include "evil_private.h"
#ifdef __cplusplus
}
#include <stdlib.h>
-#ifndef WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
+#include "evil_private.h"
#include <psapi.h> /* EnumProcessModules(Ex) */
-#include "evil_macro.h"
-#include "evil_util.h"
-#include "evil_dlfcn.h"
-#include "evil_private.h"
-
static char *_dl_err = NULL;
static int _dl_err_viewed = 0;
#include <winsock2.h> /* for ioctlsocket */
#include <io.h>
-#include "evil_macro.h"
-#include "evil_fcntl.h"
+#include "evil_private.h"
/* SOCKET is defined as a uintptr_t, so passing a fd (int) is not a problem */
static int
#include <stdlib.h>
#include <string.h>
-#include "evil_macro.h"
-#include "evil_langinfo.h"
+#include "evil_private.h"
static char *
#include <locale.h>
#include <errno.h>
-#ifndef WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-
-#include "evil_macro.h"
-#include "evil_locale.h"
+#include "evil_private.h"
/*
* LOCALE_SISO639LANGNAME and LOCALE_SISO3166CTRYNAME need at least a buffer
+++ /dev/null
-#ifndef __EVIL_MACRO_H__
-#define __EVIL_MACRO_H__
-
-#if _WIN32_WINNT < 0x0600
-# error Windows XP not supported anymore
-#endif
-
-#ifdef EAPI
-# undef EAPI
-#endif
-
-#ifdef EFL_BUILD
-# ifdef DLL_EXPORT
-# define EAPI __declspec(dllexport)
-# else
-# define EAPI
-# endif
-#else
-# define EAPI __declspec(dllimport)
-#endif
-
-
-#ifndef PATH_MAX
-# define PATH_MAX MAX_PATH
-#endif
-
-#endif /* __EVIL_MACRO_H__ */
+++ /dev/null
-#ifndef __EVIL_MACRO_POP_H__
-#define __EVIL_MACRO_POP_H__
-
-#undef EAPI
-#define EAPI
-
-
-#endif /* __EVIL_MACRO_POP_H__ */
#include <stdio.h>
-#ifndef WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-#endif
-#include <winsock2.h>
-#undef WIN32_LEAN_AND_MEAN
-
-#include "evil_macro.h"
-#include "evil_unistd.h"
-#include "evil_main.h"
#include "evil_private.h"
#include <sys/types.h>
#include <unistd.h>
-#ifndef WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-
#include <io.h>
-#include "evil_macro.h"
#include "sys/mman.h"
-#include "evil_util.h"
#include "evil_private.h"
#ifndef __EVIL_PRIVATE_H__
#define __EVIL_PRIVATE_H__
+#if _WIN32_WINNT < 0x0600
+# error Windows XP not supported anymore
+#endif
#ifdef __cplusplus
extern "C" {
# endif
#endif
+#ifndef WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+#endif
+#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+
+#include <sys/stat.h> /* for mkdir in evil_macro_wrapper */
+
+
+#ifdef EAPI
+# undef EAPI
+#endif
+
+#ifdef EFL_BUILD
+# ifdef DLL_EXPORT
+# define EAPI __declspec(dllexport)
+# else
+# define EAPI
+# endif
+#else
+# define EAPI __declspec(dllimport)
+#endif
+
+#ifndef PATH_MAX
+# define PATH_MAX MAX_PATH
+#endif
+
+#include "evil_dlfcn.h"
+#include "evil_fcntl.h"
+#include "evil_langinfo.h"
+#include "evil_locale.h"
+#include "evil_main.h"
+#include "evil_stdlib.h"
+#include "evil_stdio.h"
+#include "evil_string.h"
+#include "evil_time.h"
+#include "evil_unistd.h"
+#include "evil_util.h"
+
+#define sigsetjmp(Env, Save) setjmp(Env)
+
+#include "evil_macro_wrapper.h"
+
+#undef EAPI
+#define EAPI
+
#ifdef __cplusplus
}
#endif
#include <io.h>
#include <lmcons.h>
-#include "evil_macro.h"
+#include "evil_private.h"
#include "pwd.h"
#include <sys/types.h>
#include <direct.h>
-#ifndef WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-
-#include "evil_macro.h"
-#include "evil_stdio.h"
#include "evil_private.h"
#undef rename
#include <stdlib.h>
#include <stdio.h>
#include <io.h>
+#include <direct.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <errno.h>
-#ifndef WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-
-#include "evil_macro.h"
-#include "evil_stdlib.h"
+#include "evil_private.h"
/*
* Environment variable related functions
{
val = _mkstemp(suffix, val);
- if (mkdir(__template) == 0)
+ if (_mkdir(__template) == 0)
return __template;
if (errno == EFAULT ||
#include <string.h>
#include <ctype.h>
-#include "evil_macro.h"
-#include "evil_string.h"
+#include "evil_private.h"
/*
#include <ctype.h>
#include <time.h>
-#include "evil_macro.h"
-#include "evil_time.h"
-#include "evil_macro_wrapper.h"
#include "evil_private.h"
/*
#include <winsock2.h>
#undef WIN32_LEAN_AND_MEAN
-#include "evil_macro.h"
-#include "evil_unistd.h"
+#include "evil_private.h"
LONGLONG _evil_time_freq;
#include <limits.h>
#include <wchar.h>
-#ifndef WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-
-#include "evil_macro.h"
-#include "evil_util.h"
+#include "evil_private.h"
DWORD _evil_tls_index;
'evil_fcntl.h',
'evil_langinfo.h',
'evil_locale.h',
- 'evil_macro.h',
- 'evil_macro_pop.h',
'evil_macro_wrapper.h',
'evil_main.h',
'evil_stdio.h',
#include <sys/types.h>
-#include <evil_macro.h>
+#ifdef EAPI
+# undef EAPI
+#endif
+
+#ifdef EFL_BUILD
+# ifdef DLL_EXPORT
+# define EAPI __declspec(dllexport)
+# else
+# define EAPI
+# endif
+#else
+# define EAPI __declspec(dllimport)
+#endif
#ifdef __cplusplus
#endif
-#include <evil_macro_pop.h>
+#undef EAPI
+#define EAPI
#endif /* __EVIL_SYS_MMAN_H__ */