*** empty log message ***

diff --git a/cmd/smyrna/smyrna.vcproj b/cmd/smyrna/smyrna.vcproj
index e16fc2110a0aaf0d29f915c26ba2804f8f04f029..2c91a836e831cdf0c1009b442e82bc239b69cd57 100644 (file)
--- a/cmd/smyrna/smyrna.vcproj
+++ b/cmd/smyrna/smyrna.vcproj
@@ -119,7 +119,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                AdditionalIncludeDirectories="&quot;$(SolutionDir)/lib/expr&quot;;&quot;$(SolutionDir)/lib/vmalloc&quot;;&quot;$(SolutionDir)/lib/ast&quot;;&quot;$(SolutionDir)/lib/sfio&quot;;&quot;$(SolutionDir)/lib/gvc&quot;;&quot;C:\gtk\include\libglade-2.0&quot;;&quot;$(SolutionDir)/lib/neatogen&quot;;&quot;$(SolutionDir)/lib/sparse&quot;;&quot;$(SolutionDir)/lib/topfish&quot;;&quot;C:\gtk\lib\gtkglext-1.0\include&quot;;&quot;C:\gtk\include\gtkglext-1.0\&quot;;C:\gtk\include\cairo;&quot;C:\gtk\include\atk-1.0&quot;;&quot;C:\gtk\lib\gtk-2.0\include\cairo&quot;;&quot;C:\gtk\lib\gtk-2.0\include&quot;;&quot;C:\gtk\include\gtk-2.0\&quot;;&quot;$(SolutionDir)/cmd/smyrna/gui&quot;;&quot;$(SolutionDir)/cmd/smyrna&quot;;&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)/lib/glcomp&quot;;&quot;C:\gtk\lib\glib-2.0\include&quot;;&quot;C:\gtk\include\glib-2.0&quot;;&quot;C:\gtk\include\pango-1.0\&quot;;C:\gtk\include;&quot;$(SolutionDir)/lib/common&quot;;&quot;$(SolutionDir)/lib/gvpr&quot;;&quot;$(SolutionDir)/lib/cdt&quot;;&quot;$(SolutionDir)/lib/cgraph&quot;;&quot;$(SolutionDir)/lib/glut/glut-3.7.6-bin&quot;;&quot;$(SolutionDir)/lib/xdot&quot;"
-                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_TRIANGLE;HAVE_CONFIG_H;HAVE_GTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_DLL"
                                RuntimeLibrary="2"
                                UsePrecompiledHeader="0"
                                WarningLevel="0"

diff --git a/lib/cdt/cdt.h b/lib/cdt/cdt.h
index d0c440f9039a980f87dc8d8b5cb412a7e2e0cac9..3c3a8b2635287f7c333bd4c8e6ae5fc3d7e4c0ce 100644 (file)
--- a/lib/cdt/cdt.h
+++ b/lib/cdt/cdt.h
@@ -163,13 +163,6 @@ extern "C" {
 #define DT_DISC                3       /* discipline is about to be changed    */
 #define DT_METH                4       /* method is about to be changed        */
 
-/*visual studio*/
-#ifdef WIN32_DLL
-#ifndef CDT_EXPORTS
-#define extern __declspec(dllimport)
-#endif
-#endif
-/*end visual studio*/
 
 #if _BLD_cdt && defined(__EXPORT__)
 #define extern __EXPORT__
@@ -180,7 +173,18 @@ extern "C" {
 #if !_BLD_cdt && defined(__IMPORT__)
 #define extern __IMPORT__
 #endif
-     extern Dtmethod_t *Dtset;
+/*visual studio*/
+#ifdef WIN32_DLL
+#ifndef CDT_EXPORTS
+#define extern __declspec(dllimport)
+#else
+#define extern __declspec(dllexport)
+#endif
+#endif
+/*end visual studio*/
+
+       
+       extern Dtmethod_t *Dtset;
     extern Dtmethod_t *Dtbag;
     extern Dtmethod_t *Dtoset;
     extern Dtmethod_t *Dtobag;

diff --git a/share/gui/smyrna.glade b/share/gui/smyrna.glade
index adcf6a882f251c90d4f75ef7619aaf866dd50404..855cbfc1c77bd9a9fa8678f0bc8099229c4348bf 100755 (executable)
--- a/share/gui/smyrna.glade
+++ b/share/gui/smyrna.glade
@@ -4335,7 +4335,7 @@ Custom</property>
                      <property name="digits">0</property>
                      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
                      <property name="inverted">False</property>
-                     <property name="adjustment">5 1 100 0 0 0</property>
+                     <property name="adjustment">5 0 100 0 0 0</property>
                    </widget>
                    <packing>
                      <property name="left_attach">1</property>