Menu
▾
▴
[cadcdev-svn-commits] [291] tiki/win32/include: General cleanup, added shellapi.h to pch, for upcoming commit (command line args to tiki_main)
|
From: <cad...@li...> - 2005-12-22 01:33:28
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns=3D"http://www.w3.org/1999/xhtml"> <head><style type=3D"text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: = #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li { font-family: verdana,arial,helvetica= ,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; fo= nt-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padd= ing: 6px; } #msg ul, pre { overflow: auto; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt= ;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:aut= o;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patc= h .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 = 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 = 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[291] tiki/win32/include: General cleanup, added shellapi.h to pch= , for upcoming commit (command line args to tiki_main)</title> </head> <body> <div id=3D"msg"> <dl> <dt>Revision</dt> <dd>291</dd> <dt>Author</dt> <dd>atani</dd> <dt>Date</dt> <dd>2005-12-21 17:23:42 -0800 (Wed, 21 Dec 2005)</dd> </dl> <h3>Log Message</h3> <pre>General cleanup, added shellapi.h to pch, for upcoming commit (comma= nd line args to tiki_main)</pre> <h3>Modified Paths</h3> <ul> <li><a href=3D"#tikiwin32includeTikiglhdrsh">tiki/win32/include/Tiki/glhd= rs.h</a></li> <li><a href=3D"#tikiwin32includepchh">tiki/win32/include/pch.h</a></li> </ul> </div> <div id=3D"patch"> <h3>Diff</h3> <a id=3D"tikiwin32includeTikiglhdrsh"></a> <div class=3D"modfile"><h4>Modified: tiki/win32/include/Tiki/glhdrs.h (29= 0 =3D> 291)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/include/Tiki/glhdrs.h 2005-12-22 01:2= 1:57 UTC (rev 290) +++ tiki/win32/include/Tiki/glhdrs.h 2005-12-22 01:23:42 UTC (rev 291) </span><span class=3D"lines">@@ -1,31 +1,7 @@ </span><span class=3D"cx"> #pragma once </span><span class=3D"cx">=20 </span><del>-// #include <windows.h> </del><ins>+#include <windows.h> </ins><span class=3D"cx">=20 </span><del>-// We define these manually to avoid the massive namespace c= orruption -// that will result from including windows.h :( - -/* #ifndef APIENTRY - -#define APIENTRY -#if (defined(_M_IX86) || defined(_M_IA64) || defined(_M_AMD64)) &&am= p; !defined(MIDL_PASS) -#define DECLSPEC_IMPORT __declspec(dllimport) -#else -#define DECLSPEC_IMPORT -#endif -#if !defined(_GDI32_) -#define WINGDIAPI DECLSPEC_IMPORT -#else -#define WINGDIAPI -#endif - -#define CALLBACK __stdcall - -#endif */ - - -#include <windows.h> - </del><span class=3D"cx"> #include <GL/gl.h> </span><span class=3D"cx"> #include <GL/glu.h> </span><span class=3D"cx">=20 </span></pre></div> <a id=3D"tikiwin32includepchh"></a> <div class=3D"modfile"><h4>Modified: tiki/win32/include/pch.h (290 =3D> 2= 91)</h4> <pre class=3D"diff"> <span class=3D"info">--- tiki/win32/include/pch.h 2005-12-22 01:21:57 UTC= (rev 290) +++ tiki/win32/include/pch.h 2005-12-22 01:23:42 UTC (rev 291) </span><span class=3D"lines">@@ -11,7 +11,8 @@ </span><span class=3D"cx"> #define VC_EXTRALEAN // Exclude rarely-used s= tuff from Windows headers </span><span class=3D"cx"> #endif </span><span class=3D"cx">=20 </span><del>-#include <windows.h> </del><ins>+#include <windows.h> +#include <shellapi.h> </ins><span class=3D"cx">=20 </span><span class=3D"cx"> #define _USE_MATH_DEFINES </span><span class=3D"cx"> #include <math.h> </span></pre> </div> </div> </body> </html> |
