1
0
Fork 0
Commit Graph

89 Commits

Author SHA1 Message Date
jsteemann 4adbc5ef97 prevent macro redefinition 2017-05-29 17:35:20 +02:00
Andreas Streichardt f72b0eac05 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-03 23:32:02 +02:00
jsteemann 894a558367 try to un-mess windows build 2017-03-13 17:28:46 +01:00
jsteemann b4cdafaef9 cleanup 2017-03-03 16:53:48 +01:00
jsteemann 85468835d0 properly abort in ABORT macro 2017-03-01 12:50:36 +01:00
jsteemann ded1550e0c dirty attempt to fix MSVC compile errors 2017-02-01 10:58:09 +01:00
jsteemann fdde284fe6 cleaned up macros a bit 2017-01-25 17:50:23 +01:00
jsteemann fc1b913791 fixed some issues found by coverity build tool 2017-01-09 12:39:04 +01:00
jsteemann fca1a5431c clean up macros a bit. hopefully clang and MSVC won't complain about this 2017-01-04 12:45:23 +01:00
jsteemann b96897e296 fixed some issues detected by coverity build tool 2016-12-12 15:41:54 +01:00
Frank Celler 7df02164ee fixed supervisor startup 2016-11-02 19:37:49 +00:00
jsteemann 757085fbe4 remove structures.h (only needed by json.h) 2016-11-01 15:34:18 +01:00
Andreas Streichardt 82e784dcab WINDOWS_LEAN_AND_MEAN so the min max stuff is finally fixed 2016-10-25 08:47:48 +02:00
jsteemann b5c5407b02 try to fix compile warnings in non-maintainer mode 2016-09-27 13:31:17 +02:00
jsteemann 2ab782aeb2 removed obsolete defines 2016-08-16 17:51:33 +02:00
Frank Celler 078457c302 cleanup of calls 2016-07-26 17:20:14 +02:00
Frank Celler 967d709f28 added cmath for GCC 5.4 2016-06-08 21:40:21 +02:00
Frank Celler d6e8046992 updated cleanupCFiles 2016-04-23 16:34:57 -07:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
Frank Celler 6002ede1c4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-03 21:46:30 +02:00
Frank Celler 873f226b5f added SchedulerFeature 2016-04-01 12:52:28 +02:00
Frank Celler 486011d399 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 13:41:09 +02:00
Frank Celler 494bdca847 splitted HttpRequest into GeneralRequest/HttpRequest 2016-03-31 11:45:21 +02:00
jsteemann f840c2e6bb remove unused typedefs and functionality 2016-03-21 22:43:57 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Jan Steemann 9f84b767d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-07 08:11:01 +01:00
Frank Celler 60cd363f19 moved build date to file build-date.h.in 2016-03-05 09:49:31 +01:00
Jan Steemann 92493f2807 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 11:04:58 +01:00
Jan Steemann 2a63d04289 fix assertions in non-maintainer mode 2016-03-02 11:04:29 +01:00
Jan Steemann 4271879c08 fix assertions in non-debug builds 2016-03-02 10:54:12 +01:00
Frank Celler c88a68358d CMAKE changes for Windows and Solaris 2016-03-01 17:31:30 +01:00
Jan Steemann bd9293802d marker changes, unfinished 2016-02-26 19:39:17 +01:00
Frank Celler 4b2b85f1b5 more cleanup 2016-02-24 19:19:04 +01:00
Frank Celler ef6f83d05a removed abort 2016-02-23 15:25:05 +01:00
Frank Celler 97cfcce407 stop monitor on shutdown 2016-02-23 15:25:05 +01:00
Frank Celler 44832697d2 moved build.h 2016-02-22 16:30:53 +01:00
Frank Celler bf54539770 local-configuration.h is no longer needed 2016-02-18 14:11:25 +01:00
Jan Steemann 0ff20a6590 try to work around compiler warning 2016-02-04 12:32:56 +01:00
Frank Celler bb3acf8cd5 fixed /_admin/log 2016-02-04 00:41:50 +01:00
Jan Steemann b7abf5a40d attempt to fix Windows build 2016-02-01 12:04:28 +01:00
jsteemann 353c9732b7 removed last LOG_xxx macros 2016-01-30 04:03:18 +01:00
jsteemann dbd5c500cb remove TRI_ENABLE_LOGGING 2016-01-30 00:46:40 +01:00
Jan Steemann 9046e1831b clang-format 2016-01-27 13:43:46 +01:00
Jan Steemann 5dc0a429b2 removed spinlocks and TRI_WINDOWS_VISTA_LOCKS 2016-01-25 17:55:06 +01:00
Jan Steemann 6e24f5e016 include debug malloc 2016-01-25 11:29:08 +01:00
jsteemann 431900f17a changed namespace from triagens to arangodb 2016-01-17 00:44:53 +01:00
jsteemann 0421c619a6 merge defines 2016-01-14 23:46:20 +01:00
Jan Steemann 3ad20c0cae auto-generated headers 2016-01-06 18:41:51 +01:00
Jan Steemann a3b026d9d1 removed useless sections from code, unified include guards 2016-01-06 14:15:22 +01:00