mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity
subsurface/subsurface-core
History
Lubomir I. Ivanov 694fc9d00f libdivecomputer.h: fix warning with DC_VERSION on Win32 
"warning: "DC_VERSION" redefined" is thrown if a chain of
includes previously includes windows.h:

In file included from c:/bin/mingw/i686-w64-mingw32/include/windows.h:71:0,
    from C:/bin/qt/5.5/mingw492_32/include/QtCore/qt_windows.h:63,
    from C:/bin/qt/5.5/mingw492_32/include/QtGui/qopengl.h:43,
    from C:/bin/qt/5.5/mingw492_32/include/QtQuick/qquickwindow.h:39,
    from C:/bin/qt/5.5/mingw492_32/include/QtQuick/QQuickWindow:1,
    from C:/dev/subsurface/subsurface-core/qt-gui.h:13,
    from C:\dev\subsurface\subsurface-mobile-main.cpp:9:

and which on it's own includes wingdi.h which defines
"DC_VERSION 10" (windows printer stack related).

To solve the warning DC_VERSION is undefined in
subsurface-core/libdivecomputer.h.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-18 19:24:21 -08:00
..
android.cpp Android: go back to using Qt's DataLocation 2015-11-07 10:52:19 -08:00
checkcloudconnection.cpp Cloud storage: modify protocol for checking cloud connectivity 2015-11-18 17:57:13 -08:00
checkcloudconnection.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
CMakeLists.txt Location service: move into subsurface-core 2015-11-18 18:34:49 -08:00
cochran.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
cochran.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
color.cpp Move qt-ui to desktop-widgets 2015-10-30 10:36:49 -07:00
color.h Move qt-ui to desktop-widgets 2015-10-30 10:36:49 -07:00
configuredivecomputer.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
configuredivecomputer.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
configuredivecomputerthreads.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
configuredivecomputerthreads.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
datatrak.c simple spelling changes 2015-11-15 12:10:37 -08:00
datatrak.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
deco.c Merge branch 'cmakeAndPreferences' 2015-11-02 19:54:34 -08:00
deco.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
device.c simple spelling changes 2015-11-15 12:10:37 -08:00
device.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
devicedetails.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
devicedetails.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
display.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
dive.c dive.c: fix a couple of comment typos 2015-11-16 09:26:08 -08:00
dive.h Location service: instantiate location provider in the desktop UI 2015-11-18 18:52:44 -08:00
divecomputer.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
divecomputer.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
divelist.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
divelist.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
divelogexportlogic.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
divelogexportlogic.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
divesite.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
divesite.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
divesite.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
divesitehelpers.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
divesitehelpers.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
equipment.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
exif.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
exif.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
file.c Merge branch 'cmakeAndPreferences' 2015-11-02 19:54:34 -08:00
file.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
gaspressures.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
gaspressures.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
gettext.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
gettextfromc.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
gettextfromc.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
git-access.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
git-access.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
gpslocation.cpp applyLocations should be a void function 2015-11-18 19:23:19 -08:00
gpslocation.h applyLocations should be a void function 2015-11-18 19:23:19 -08:00
helpers.h Create date and time formats preferences 2015-11-02 12:51:31 -08:00
imagedownloader.cpp Move ImageDownloader out of the desktop widgets 2015-11-06 11:30:11 -08:00
imagedownloader.h Move ImageDownloader out of the desktop widgets 2015-11-06 11:30:11 -08:00
isocialnetworkintegration.cpp Removed unused files 2015-11-09 18:00:56 -08:00
isocialnetworkintegration.h Remove the PluginSystem 2015-11-09 18:00:56 -08:00
libdivecomputer.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
libdivecomputer.h libdivecomputer.h: fix warning with DC_VERSION on Win32 2015-11-18 19:24:21 -08:00
linux.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
liquivision.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
load-git.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
macos.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
membuffer.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
membuffer.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
metrics.cpp Move qt-ui to desktop-widgets 2015-10-30 10:36:49 -07:00
metrics.h Move qt-ui to desktop-widgets 2015-10-30 10:36:49 -07:00
ostctools.c simple spelling changes 2015-11-15 12:10:37 -08:00
parse-xml.c Merge branch 'cmakeAndPreferences' 2015-11-02 19:54:34 -08:00
planner.c planner.c: fix 'disclaimer' pointing to stack memory 2015-11-15 10:08:28 -08:00
planner.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
pluginmanager.cpp Make it possible to connect to facebook again 2015-11-08 09:44:40 -08:00
pluginmanager.h Remove empty implementations 2015-11-09 18:00:56 -08:00
pref.h Location service: make distance and time threshold configurable 2015-11-14 09:10:06 -08:00
prefs-macros.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
profile.c profile.c: remove unused variables 2015-11-07 22:26:33 -08:00
profile.h profile.h: fix incomplete type 2015-11-06 09:59:00 -08:00
qt-gui.h Missing half of the previous commit 2015-11-14 10:43:37 -08:00
qt-init.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
qthelper.cpp Cloud storage: modify protocol for checking cloud connectivity 2015-11-18 17:57:13 -08:00
qthelper.h Cloud storage: modify protocol for checking cloud connectivity 2015-11-18 17:57:13 -08:00
qthelperfromc.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
qtserialbluetooth.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
save-git.c Location service: instantiate location provider in the desktop UI 2015-11-18 18:52:44 -08:00
save-html.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
save-html.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
save-xml.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
serial_ftdi.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
sha1.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
sha1.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
statistics.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
statistics.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
strndup.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
strtod.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
subsurfacestartup.c subsurfacestartup.c: leave free_prefs() empty 2015-11-15 10:29:36 -08:00
subsurfacestartup.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
subsurfacesysinfo.cpp Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
subsurfacesysinfo.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
taxonomy.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
taxonomy.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
time.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
uemis-downloader.c simple spelling changes 2015-11-15 12:10:37 -08:00
uemis.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
uemis.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
units.h Fix M_PI with -std=c++11 on Mingw 2015-11-03 07:19:05 -08:00
version.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
version.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
webservice.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
windows.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
windowtitleupdate.cpp Don't crash if we have no WindowTitleUpdater registered 2015-11-07 09:53:17 -08:00
windowtitleupdate.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
worldmap-options.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
worldmap-save.c Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00
worldmap-save.h Move all core-functionality to subsurface-core 2015-10-30 10:36:48 -07:00