aboutsummaryrefslogtreecommitdiff
path: root/ycm_extra_conf.py
diff options
context:
space:
mode:
Diffstat (limited to 'ycm_extra_conf.py')
-rw-r--r--ycm_extra_conf.py27
1 files changed, 27 insertions, 0 deletions
diff --git a/ycm_extra_conf.py b/ycm_extra_conf.py
index 7a1828f..3c2b399 100644
--- a/ycm_extra_conf.py
+++ b/ycm_extra_conf.py
@@ -1,3 +1,4 @@
1<<<<<<< Updated upstream
1def FlagsForFile(filename, **kwargs): 2def FlagsForFile(filename, **kwargs):
2 return { 3 return {
3 'flags': [ 4 'flags': [
@@ -19,3 +20,29 @@ def FlagsForFile(filename, **kwargs):
19 } 20 }
20 21
21# vim:set et sw=4 ts=4 tw=120: 22# vim:set et sw=4 ts=4 tw=120:
23=======
24import os
25import ycm_core
26
27def FlagsForFile( filename, **kwargs ):
28 return {
29 'flags': [
30 '-Wall',
31 '-Wextra',
32 '-Werror',
33 '-Wno-long-long',
34 '-Wno-variadic-macros',
35 '-fexceptions',
36 '-ferror-limit=10000',
37 '-DNDEBUG',
38 '-std=c99',
39 '-x', 'c',
40 '-D_GNU_SOURCE',
41 '-I.',
42 '-I', '/usr/include/'
43 ],
44 'do_cache': True,
45 }
46
47# vim:set et sw=2 ts=2 tw=120:
48>>>>>>> Stashed changes
..