enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

* src/lib/Evil.h: 

* src/lib/Makefile.am:
	* src/lib/evil_macro.h:
	* src/lib/evil_print.h:
	* src/lib/evil_macro_pop.h (added):
	Undef __cdecl if it has been defined by Evil and
	move some defined macro to evil_macro_pop.h
	* src/lib/evil_unistd.c:
	* src/lib/evil_unistd.h:
	Define gettimeofday() only for vc++ as MinGW-w64
	already defines it.



SVN revision: 68117
This commit is contained in:
Vincent Torri 2012-02-18 18:11:10 +00:00
parent 62f4f8f2f8
commit 3ece862b75
8 changed files with 114 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
legacy/evil/ChangeLog
View File

@ -1,3 +1,18 @@
2012-02-18 Vincent Torri <doursse at users dot sf dot net>
* src/lib/Evil.h:
* src/lib/Makefile.am:
* src/lib/evil_macro.h:
* src/lib/evil_print.h:
* src/lib/evil_macro_pop.h (added):
Undef __cdecl if it has been defined by Evil and
move some defined macro to evil_macro_pop.h
* src/lib/evil_unistd.c:
* src/lib/evil_unistd.h:
Define gettimeofday() only for vc++ as MinGW-w64
already defines it.
2012-02-17 Vincent Torri <doursse at users dot sf dot net>
* AUTHORS:

20
legacy/evil/src/lib/Evil.h
View File

@ -129,25 +129,7 @@ typedef unsigned long gid_t;
#include "evil_time.h"
#include "evil_unistd.h"
#include "evil_util.h"
#define fprintf _evil_fprintfa
#define printf _evil_printfa
#define snprintf _evil_snprintfa
#define sprintf _evil_sprintfa
#define vfprintf _evil_vfprintfa
#define vprintf _evil_vprintfa
#define vsnprintf _evil_vsnprintfa
#define vsprintf _evil_vsprintfa
#define fscanf _evil_fscanf
#define scanf _evil_scanf
#define sscanf _evil_sscanf
#define vfscanf _evil_vfscanf
#define vscanf _evil_vscanf
#define vsscanf _evil_vsscanf
#define asprintf _evil_asprintf
#define vasprintf _evil_vasprintf
#include "evil_macro_pop.h"
#if (defined(_WIN32) && !defined(_UWIN) && !defined(__CYGWIN__))

1
legacy/evil/src/lib/Makefile.am
View File

@ -13,6 +13,7 @@ evil_inet.h \
evil_langinfo.h \
evil_libgen.h \
evil_macro.h \
evil_macro_pop.h \
evil_main.h \
evil_print.h \
evil_stdlib.h \

1
legacy/evil/src/lib/evil_macro.h
View File

@ -3,6 +3,7 @@
#ifndef __cdecl
# define EVIL_CDECL_IS_DEFINED
# ifdef __GNUC__
# define __cdecl __attribute__((__cdecl__))
# else

93
legacy/evil/src/lib/evil_macro_pop.h Normal file
View File

@ -0,0 +1,93 @@
#ifndef __EVIL_MACRO_POP_H__
#define __EVIL_MACRO_POP_H__
#ifdef EVIL_CDECL_IS_DEFINED
# undef __cdecl
# undef EVIL_CDECL_IS_DEFINED
#endif
#define fprintf _evil_fprintfa
#define printf _evil_printfa
#define snprintf _evil_snprintfa
#define sprintf _evil_sprintfa
#define vfprintf _evil_vfprintfa
#define vprintf _evil_vprintfa
#define vsnprintf _evil_vsnprintfa
#define vsprintf _evil_vsprintfa
#define fscanf _evil_fscanf
#define scanf _evil_scanf
#define sscanf _evil_sscanf
#define vfscanf _evil_vfscanf
#define vscanf _evil_vscanf
#define vsscanf _evil_vsscanf
#define asprintf _evil_asprintf
#define vasprintf _evil_vasprintf
/* Redefine to GNU specific PRI... and SCN... macros. */
#define PRId64 "lld"
#define PRIdLEAST64 "lld"
#define PRIdFAST64 "lld"
#define PRIdMAX "lld"
#define PRIi64 "lli"
#define PRIiLEAST64 "lli"
#define PRIiFAST64 "lli"
#define PRIiMAX "lli"
#define PRIo64 "llo"
#define PRIoLEAST64 "llo"
#define PRIoFAST64 "llo"
#define PRIoMAX "llo"
#define PRIu64 "llu"
#define PRIuLEAST64 "llu"
#define PRIuFAST64 "llu"
#define PRIuMAX "llu"
#define PRIx64 "llx"
#define PRIxLEAST64 "llx"
#define PRIxFAST64 "llx"
#define PRIxMAX "llx"
#define PRIX64 "llX"
#define PRIXLEAST64 "llX"
#define PRIXFAST64 "llX"
#define PRIXMAX "llX"
#define SCNd64 "lld"
#define SCNdLEAST64 "lld"
#define SCNdFAST64 "lld"
#define SCNdMAX "lld"
#define SCNi64 "lli"
#define SCNiLEAST64 "lli"
#define SCNiFAST64 "lli"
#define SCNiMAX "lli"
#define SCNo64 "llo"
#define SCNoLEAST64 "llo"
#define SCNoFAST64 "llo"
#define SCNoMAX "llo"
#define SCNx64 "llx"
#define SCNxLEAST64 "llx"
#define SCNxFAST64 "llx"
#define SCNxMAX "llx"
#define SCNu64 "llu"
#define SCNuLEAST64 "llu"
#define SCNuFAST64 "llu"
#define SCNuMAX "llu"
#ifdef _WIN64
#define PRIdPTR "lld"
#define PRIiPTR "lli"
#define PRIoPTR "llo"
#define PRIuPTR "llu"
#define PRIxPTR "llx"
#define PRIXPTR "llX"
#define SCNdPTR "lld"
#define SCNiPTR "lli"
#define SCNoPTR "llo"
#define SCNxPTR "llx"
#define SCNuPTR "llu"
#endif /* _WIN64 */
#endif /* __EVIL_MACRO_POP_H__ */

66
legacy/evil/src/lib/evil_print.h
View File

@ -33,71 +33,5 @@ EAPI int __cdecl _evil_vprintfw(const wchar_t *, va_list) __EVIL_NOTHROW;
EAPI int __cdecl _evil_vsprintfw(wchar_t *, const wchar_t *, va_list) __EVIL_NOTHROW;
EAPI int __cdecl _evil_vsnprintfw(wchar_t *, size_t, const wchar_t *, va_list) __EVIL_NOTHROW;
/* Redefine to GNU specific PRI... and SCN... macros. */
/* #if defined(_INTTYPES_H_) && defined(PRId64) */
#define PRId64 "lld"
#define PRIdLEAST64 "lld"
#define PRIdFAST64 "lld"
#define PRIdMAX "lld"
#define PRIi64 "lli"
#define PRIiLEAST64 "lli"
#define PRIiFAST64 "lli"
#define PRIiMAX "lli"
#define PRIo64 "llo"
#define PRIoLEAST64 "llo"
#define PRIoFAST64 "llo"
#define PRIoMAX "llo"
#define PRIu64 "llu"
#define PRIuLEAST64 "llu"
#define PRIuFAST64 "llu"
#define PRIuMAX "llu"
#define PRIx64 "llx"
#define PRIxLEAST64 "llx"
#define PRIxFAST64 "llx"
#define PRIxMAX "llx"
#define PRIX64 "llX"
#define PRIXLEAST64 "llX"
#define PRIXFAST64 "llX"
#define PRIXMAX "llX"
#define SCNd64 "lld"
#define SCNdLEAST64 "lld"
#define SCNdFAST64 "lld"
#define SCNdMAX "lld"
#define SCNi64 "lli"
#define SCNiLEAST64 "lli"
#define SCNiFAST64 "lli"
#define SCNiMAX "lli"
#define SCNo64 "llo"
#define SCNoLEAST64 "llo"
#define SCNoFAST64 "llo"
#define SCNoMAX "llo"
#define SCNx64 "llx"
#define SCNxLEAST64 "llx"
#define SCNxFAST64 "llx"
#define SCNxMAX "llx"
#define SCNu64 "llu"
#define SCNuLEAST64 "llu"
#define SCNuFAST64 "llu"
#define SCNuMAX "llu"
#ifdef _WIN64
#define PRIdPTR "lld"
#define PRIiPTR "lli"
#define PRIoPTR "llo"
#define PRIuPTR "llu"
#define PRIxPTR "llx"
#define PRIXPTR "llX"
#define SCNdPTR "lld"
#define SCNiPTR "lli"
#define SCNoPTR "llo"
#define SCNxPTR "llx"
#define SCNuPTR "llu"
#endif /* _WIN64 */
/* #endif /\* defined(_INTTYPES_H_) && defined(PRId64) *\/ */
#endif /* __EVIL_PRINT_H__ */

2
legacy/evil/src/lib/evil_unistd.c
View File

@ -66,6 +66,7 @@ evil_time_get(void)
return (double)_evil_time_second + (double)(count.QuadPart - _evil_time_count)/ (double)_evil_time_freq;
}
#ifdef _MSC_VER
int
evil_gettimeofday(struct timeval *tp, void *tzp __UNUSED__)
{
@ -80,7 +81,6 @@ evil_gettimeofday(struct timeval *tp, void *tzp __UNUSED__)
return 1;
}
#ifdef _MSC_VER
int
evil_usleep(unsigned long usec)
{

4
legacy/evil/src/lib/evil_unistd.h
View File

@ -35,6 +35,8 @@
*/
EAPI double evil_time_get(void);
#ifdef _MSC_VER
/**
* @brief Retrieve the time since the Evil library has been
* initialized.
@ -62,8 +64,6 @@ EAPI int evil_gettimeofday(struct timeval * tp, void * tzp);
*/
#define gettimeofday(tp,tzp) evil_gettimeofday((tp),(tzp))
#ifdef _MSC_VER
/**
* @brief Suspend the execution of the calling process for microsecond
* intervals.