cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-08-04 09:46:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Oops; fix a merge conflict that got committed into event2/event-config.h. Now msvc builds work again.

Browse Source
This commit is contained in:
Nick Mathewson 2012-04-03 16:08:23 -04:00
parent 6c95c6c8a2
commit 07cb57042d
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
WIN32-Code/event2/event-config.h
View File

@ -334,13 +334,7 @@
#define EVENT__TIME_WITH_SYS_TIME 1 #define EVENT__TIME_WITH_SYS_TIME 1
/* Version number of package */ /* Version number of package */
<<<<<<< HEAD
#define EVENT__VERSION "2.1.0-alpha-dev" #define EVENT__VERSION "2.1.0-alpha-dev"
||||||| merged common ancestors
#define EVENT__VERSION "2.0.16-stable-dev"
=======
#define EVENT__VERSION "2.0.17-stable"
>>>>>>> origin/patches-2.0
/* Define to appropriate substitue if compiler doesnt have __func__ */ /* Define to appropriate substitue if compiler doesnt have __func__ */
#define EVENT____func__ __FUNCTION__ #define EVENT____func__ __FUNCTION__