[SVN-NetXMS] revision 3403

* { font-family: Consolas, Lucida Console, Courier New; font-size: 100%; }
h1 { font-size: 150%; }
td.linenos { background-color: #f0f0f0; padding-right: 10px; }
span.lineno { background-color: #f0f0f0; padding: 0 5px 0 5px; }
pre { line-height: 100%; width: 100%; }
.highlight span { width: 100%; display:-moz-inline-stack; display:inline-block; zoom:1; *display:inline; }
body { background: #ffffff; }
body .c { color: #999988; font-style: italic } /* Comment */
body .err { color: #a61717; background-color: #e3d2d2 } /* Error */
body .k { font-weight: bold } /* Keyword */
body .o { font-weight: bold } /* Operator */
body .cm { color: #999988; font-style: italic } /* Comment.Multiline */
body .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
body .c1 { color: #999988; font-style: italic } /* Comment.Single */
body .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
body .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
body .ge { font-style: italic } /* Generic.Emph */
body .gr { color: #aa0000 } /* Generic.Error */
body .gh { color: #999999 } /* Generic.Heading */
body .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
body .go { color: #888888 } /* Generic.Output */
body .gp { color: #555555 } /* Generic.Prompt */
body .gs { font-weight: bold } /* Generic.Strong */
body .gu { color: #aaaaaa } /* Generic.Subheading */
body .gt { color: #aa0000 } /* Generic.Traceback */
body .kc { font-weight: bold } /* Keyword.Constant */
body .kd { font-weight: bold } /* Keyword.Declaration */
body .kp { font-weight: bold } /* Keyword.Pseudo */
body .kr { font-weight: bold } /* Keyword.Reserved */
body .kt { color: #445588; font-weight: bold } /* Keyword.Type */
body .m { color: #009999 } /* Literal.Number */
body .s { color: #bb8844 } /* Literal.String */
body .na { color: #008080 } /* Name.Attribute */
body .nb { color: #999999 } /* Name.Builtin */
body .nc { color: #445588; font-weight: bold } /* Name.Class */
body .no { color: #008080 } /* Name.Constant */
body .ni { color: #800080 } /* Name.Entity */
body .ne { color: #990000; font-weight: bold } /* Name.Exception */
body .nf { color: #990000; font-weight: bold } /* Name.Function */
body .nn { color: #555555 } /* Name.Namespace */
body .nt { color: #000080 } /* Name.Tag */
body .nv { color: #008080 } /* Name.Variable */
body .ow { font-weight: bold } /* Operator.Word */
body .w { color: #bbbbbb } /* Text.Whitespace */
body .mf { color: #009999 } /* Literal.Number.Float */
body .mh { color: #009999 } /* Literal.Number.Hex */
body .mi { color: #009999 } /* Literal.Number.Integer */
body .mo { color: #009999 } /* Literal.Number.Oct */
body .sb { color: #bb8844 } /* Literal.String.Backtick */
body .sc { color: #bb8844 } /* Literal.String.Char */
body .sd { color: #bb8844 } /* Literal.String.Doc */
body .s2 { color: #bb8844 } /* Literal.String.Double */
body .se { color: #bb8844 } /* Literal.String.Escape */
body .sh { color: #bb8844 } /* Literal.String.Heredoc */
body .si { color: #bb8844 } /* Literal.String.Interpol */
body .sx { color: #bb8844 } /* Literal.String.Other */
body .sr { color: #808000 } /* Literal.String.Regex */
body .s1 { color: #bb8844 } /* Literal.String.Single */
body .ss { color: #bb8844 } /* Literal.String.Symbol */
body .bp { color: #999999 } /* Name.Builtin.Pseudo */
body .vc { color: #008080 } /* Name.Variable.Class */
body .vg { color: #008080 } /* Name.Variable.Global */
body .vi { color: #008080 } /* Name.Variable.Instance */
body .il { color: #009999 } /* Literal.Number.Integer.Long */

Info

Revision:3403
Author:victor

Date:2008-08-01 16:43:23 +0300 (Fri, 01 Aug 2008)

Comment:minor fixes

Changes
U trunk/include/nms_common.h
U trunk/src/agent/install/nxagent.iss
U trunk/src/agent/subagents/portCheck/smtp.cpp
U trunk/src/libnetxms/message.cpp

Diff
Modified: trunk/include/nms_common.h
===================================================================
--- trunk/include/nms_common.h 2008-08-01 13:12:47 UTC (rev 3402)
+++ trunk/include/nms_common.h 2008-08-01 13:43:23 UTC (rev 3403)
@@ -164,7 +164,7 @@
 #define O_TRUNC 0x0800
 #endif
 
-#ifndef UNDER_CE
+#if !defined(UNDER_CE) && !defined(__64BIT__)
 #define HAVE_LIBEXPAT 1
 #endif
 

Modified: trunk/src/agent/install/nxagent.iss
===================================================================
--- trunk/src/agent/install/nxagent.iss 2008-08-01 13:12:47 UTC (rev 3402)
+++ trunk/src/agent/install/nxagent.iss 2008-08-01 13:43:23 UTC (rev 3403)
@@ -35,6 +35,7 @@
 Source: "..\subagents\ups\Release\ups.nsm"; DestDir: "{app}\bin"; Flags: ignoreversion
 Source: "..\..\..\contrib\nxagentd.conf-dist"; DestDir: "{app}\etc"; Flags: ignoreversion
 Source: "..\..\install\windows\files\libeay32.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "..\..\install\windows\files\libexpat.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
 
 [Dirs]
 Name: "{app}\etc"

Modified: trunk/src/agent/subagents/portCheck/smtp.cpp
===================================================================
--- trunk/src/agent/subagents/portCheck/smtp.cpp 2008-08-01 13:12:47 UTC (rev 3402)
+++ trunk/src/agent/subagents/portCheck/smtp.cpp 2008-08-01 13:43:23 UTC (rev 3403)
@@ -91,7 +91,7 @@
                                                                                         snprintf(szBuff, sizeof(szBuff), "From: <noreply@%s>\r\nTo: <%s>\r\nSubject: NetXMS test mail\r\nDate: %s\r\n\r\nNetXMS test mail\r\n.\r\n",
                                                                                                  szHostname, szTo, szTime);
                                                                                         
- if (NetWrite(nSd, szBuff, strlen(szBuff)) > 0)
+ if (NetWrite(nSd, szBuff, (int)strlen(szBuff)) > 0)
                                                                                         {
                                                                                                 CHECK_OK("250")
                                                                                                 {

Modified: trunk/src/libnetxms/message.cpp
===================================================================
--- trunk/src/libnetxms/message.cpp 2008-08-01 13:12:47 UTC (rev 3402)
+++ trunk/src/libnetxms/message.cpp 2008-08-01 13:43:23 UTC (rev 3403)
@@ -941,7 +941,7 @@
                                         tempStr[blen] = 0;
                                         xml.AddDynamicString(tempStr);
 #else
- xml.AddString(bdata, blen);
+ xml.AddString(bdata, (DWORD)blen);
 #endif
                                 }
                                 safe_free(bdata);
Received on Fri Aug 01 2008 - 16:43:23 EEST