Commit fd3479d4 authored by Erwin Janssen's avatar Erwin Janssen

Remove MSWIN32 define in favor of _WIN32

Instead of using the the `MSWIN32` define set by the user, rely on the
define `_WIN32`, which is set by the compiler.

Some whitespace was also trimmed.
parent d8a4a489
......@@ -52,7 +52,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)lib\ast;$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\gvpr</AdditionalIncludeDirectories>
<PreprocessorDefinitions>MSWIN32;_DEBUG;_WINDOWS;WIN32_DLL;GVDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_DEBUG;_WINDOWS;WIN32_DLL;GVDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
......@@ -129,4 +129,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
\ No newline at end of file
</Project>
......@@ -2,7 +2,7 @@
/* vim:set shiftwidth=4 ts=8: */
/*************************************************************************
* Copyright (c) 2011 AT&T Intellectual Property
* Copyright (c) 2011 AT&T Intellectual Property
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
......@@ -36,7 +36,7 @@ extern "C" {
#include <setjmp.h>
#include <ctype.h>
#ifdef MSWIN32
#ifdef _WIN32
#include <windows.h>
#include <commdlg.h>
#include <malloc.h>
......
......@@ -2,7 +2,7 @@
/* vim:set shiftwidth=4 ts=8: */
/*************************************************************************
* Copyright (c) 2011 AT&T Intellectual Property
* Copyright (c) 2011 AT&T Intellectual Property
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
......@@ -26,9 +26,9 @@ extern "C" {
* At some point, we could consider allowing these to be set in configure
* See Makefile.old for others.
*/
#define FEATURE_MINTSIZE 1
#define FEATURE_MINTSIZE 1
#define FEATURE_DOT 1
#if defined(_WIN32) || defined(MSWIN32)
#if defined(_WIN32)
#ifndef FEATURE_WIN32
#define FEATURE_WIN32 1
#endif
......@@ -45,7 +45,7 @@ extern "C" {
#include <limits.h>
#include <sys/types.h>
#include <sys/stat.h>
#ifndef MSWIN32
#ifndef _WIN32
#include <sys/time.h>
#endif
#ifdef HAVE_SYS_SELECT_H
......@@ -105,4 +105,3 @@ void panic2 (char *, int, char *, char *, ...);
#ifdef __cplusplus
}
#endif
......@@ -53,7 +53,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\lib\glib-2.0\include;$(SolutionDir)windows\dependencies\GTK2\include\glib-2.0;$(SolutionDir)windows\dependencies\GTK2\include\pango-1.0\;$(SolutionDir)windows\dependencies\GTK2\include\cairo;$(SolutionDir)windows\dependencies\GTK2\include\freetype2;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir)/libltdl;$(SolutionDir)/lib/neatogen;$(SolutionDir)/lib/agutil;$(SolutionDir)/windows/lib/cdt;$(SolutionDir)/;$(SolutionDir)/lib/graph;$(SolutionDir)/lib/vpsc;$(SolutionDir)/lib/vmalloc;$(SolutionDir)/lib/twopigen;$(SolutionDir)/lib/sparse;$(SolutionDir)/lib/sfio;$(SolutionDir)/lib/sfpdpgen;$(SolutionDir)/lib/rbtree;$(SolutionDir)/lib/pathplan;$(SolutionDir)/lib/patchwork;$(SolutionDir)/lib/pack;$(SolutionDir)/lib/ortho;$(SolutionDir)/lib/inkpot;$(SolutionDir)/lib/ingraphs;$(SolutionDir)/lib/filter;$(SolutionDir)/lib/fdpgen;$(SolutionDir)/lib/expr;$(SolutionDir)/lib/dotgen;$(SolutionDir)/lib/circogen;$(SolutionDir)/lib/ast;$(SolutionDir)/lib/agraph;$(SolutionDir)/lib/common;$(SolutionDir)/lib/gvc;$(SolutionDir)/lib/cdt;$(SolutionDir)/lib/cgraph;$(SolutionDir)/cmd/lefty/ws/mswin32;$(SolutionDir)/cmd/lefty;$(SolutionDir)/cmd/lefty/dot2l;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;MSWIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
......@@ -76,7 +76,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\lib\glib-2.0\include;$(SolutionDir)windows\dependencies\GTK2\include\glib-2.0;$(SolutionDir)windows\dependencies\GTK2\include\pango-1.0\;$(SolutionDir)windows\dependencies\GTK2\include\cairo;$(SolutionDir)windows\dependencies\GTK2\include\freetype2;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir)/libltdl;$(SolutionDir)/lib/agutil;$(SolutionDir)/windows/lib/cdt;$(SolutionDir)/;$(SolutionDir)/lib/graph;$(SolutionDir)/lib/vpsc;$(SolutionDir)/lib/vmalloc;$(SolutionDir)/lib/twopigen;$(SolutionDir)/lib/sparse;$(SolutionDir)/lib/sfio;$(SolutionDir)/lib/sfpdpgen;$(SolutionDir)/lib/rbtree;$(SolutionDir)/lib/pathplan;$(SolutionDir)/lib/patchwork;$(SolutionDir)/lib/pack;$(SolutionDir)/lib/ortho;$(SolutionDir)/lib/inkpot;$(SolutionDir)/lib/ingraphs;$(SolutionDir)/lib/filter;$(SolutionDir)/lib/fdpgen;$(SolutionDir)/lib/expr;$(SolutionDir)/lib/dotgen;$(SolutionDir)/lib/circogen;$(SolutionDir)/lib/ast;$(SolutionDir)/lib/agraph;$(SolutionDir)/lib/common;$(SolutionDir)/lib/gvc;$(SolutionDir)/lib/cdt;$(SolutionDir)/lib/cgraph;$(SolutionDir)/cmd/lefty/ws/mswin32;$(SolutionDir)/cmd/lefty;$(SolutionDir)/cmd/lefty/dot2l;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;MSWIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader />
<WarningLevel>TurnOffAllWarnings</WarningLevel>
......@@ -151,4 +151,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
\ No newline at end of file
</Project>
......@@ -6,28 +6,28 @@
!IF "$(CFG)" == ""
CFG=lneato - Win32 Debug
!MESSAGE No configuration specified. Defaulting to lneato - Win32 Debug.
!ENDIF
!ENDIF
!IF "$(CFG)" != "lneato - Win32 Release" && "$(CFG)" != "lneato - Win32 Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
!MESSAGE You can specify a configuration when running NMAKE on this makefile
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE
!MESSAGE NMAKE /f "lneato.mak" CFG="lneato - Win32 Debug"
!MESSAGE
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE
!MESSAGE "lneato - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE "lneato - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE
!MESSAGE
!ERROR An invalid configuration is specified.
!ENDIF
!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE
!ELSE
NULL=nul
!ENDIF
!ENDIF
################################################################################
# Begin Project
# PROP Target_Last_Scanned "lneato - Win32 Debug"
......@@ -52,7 +52,7 @@ INTDIR=.\Release
ALL : "$(OUTDIR)\lneato.exe"
CLEAN :
CLEAN :
-@erase "$(INTDIR)\lneato.obj"
-@erase "$(OUTDIR)\lneato.exe"
......@@ -62,27 +62,27 @@ CLEAN :
# ADD BASE CPP /nologo /W3 /GX /O2 /D "MSWIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
# ADD CPP /nologo /W3 /GX /O2 /D "MSWIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c
CPP_PROJ=/nologo /ML /W3 /GX /O2 /D "MSWIN32" /D "NDEBUG" /D "_WINDOWS"\
/Fp"$(INTDIR)/lneato.pch" /YX /Fo"$(INTDIR)/" /c
/Fp"$(INTDIR)/lneato.pch" /YX /Fo"$(INTDIR)/" /c
CPP_OBJS=.\Release/
CPP_SBRS=.\.
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /win32
MTL_PROJ=/nologo /D "NDEBUG" /win32
MTL_PROJ=/nologo /D "NDEBUG" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
BSC32_FLAGS=/nologo /o"$(OUTDIR)/lneato.bsc"
BSC32_FLAGS=/nologo /o"$(OUTDIR)/lneato.bsc"
BSC32_SBRS= \
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
odbccp32.lib /nologo /subsystem:windows /incremental:no\
/pdb:"$(OUTDIR)/lneato.pdb" /machine:I386 /out:"$(OUTDIR)/lneato.exe"
/pdb:"$(OUTDIR)/lneato.pdb" /machine:I386 /out:"$(OUTDIR)/lneato.exe"
LINK32_OBJS= \
"$(INTDIR)\lneato.obj"
......@@ -108,7 +108,7 @@ INTDIR=.\Debug
ALL : "$(OUTDIR)\lneato.exe"
CLEAN :
CLEAN :
-@erase "$(INTDIR)\lneato.obj"
-@erase "$(INTDIR)\vc40.idb"
-@erase "$(INTDIR)\vc40.pdb"
......@@ -122,27 +122,27 @@ CLEAN :
# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "MSWIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /D "MSWIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
CPP_PROJ=/nologo /MLd /W3 /Gm /GX /Zi /Od /D "MSWIN32" /D "_DEBUG" /D\
"_WINDOWS" /Fp"$(INTDIR)/lneato.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
"_WINDOWS" /Fp"$(INTDIR)/lneato.pch" /YX /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\.
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /win32
MTL_PROJ=/nologo /D "_DEBUG" /win32
MTL_PROJ=/nologo /D "_DEBUG" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
BSC32_FLAGS=/nologo /o"$(OUTDIR)/lneato.bsc"
BSC32_FLAGS=/nologo /o"$(OUTDIR)/lneato.bsc"
BSC32_SBRS= \
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
odbccp32.lib /nologo /subsystem:windows /incremental:yes\
/pdb:"$(OUTDIR)/lneato.pdb" /debug /machine:I386 /out:"$(OUTDIR)/lneato.exe"
/pdb:"$(OUTDIR)/lneato.pdb" /debug /machine:I386 /out:"$(OUTDIR)/lneato.exe"
LINK32_OBJS= \
"$(INTDIR)\lneato.obj"
......@@ -151,25 +151,25 @@ LINK32_OBJS= \
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
!ENDIF
!ENDIF
.c{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
$(CPP) $(CPP_PROJ) $<
.cpp{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
$(CPP) $(CPP_PROJ) $<
.cxx{$(CPP_OBJS)}.obj:
$(CPP) $(CPP_PROJ) $<
$(CPP) $(CPP_PROJ) $<
.c{$(CPP_SBRS)}.sbr:
$(CPP) $(CPP_PROJ) $<
$(CPP) $(CPP_PROJ) $<
.cpp{$(CPP_SBRS)}.sbr:
$(CPP) $(CPP_PROJ) $<
$(CPP) $(CPP_PROJ) $<
.cxx{$(CPP_SBRS)}.sbr:
$(CPP) $(CPP_PROJ) $<
$(CPP) $(CPP_PROJ) $<
################################################################################
# Begin Target
......@@ -181,7 +181,7 @@ LINK32_OBJS= \
!ELSEIF "$(CFG)" == "lneato - Win32 Debug"
!ENDIF
!ENDIF
################################################################################
# Begin Source File
......@@ -190,7 +190,7 @@ SOURCE=.\lneato.c
DEP_CPP_LNEAT=\
{$(INCLUDE)}"\sys\stat.h"\
{$(INCLUDE)}"\sys\types.h"\
"$(INTDIR)\lneato.obj" : $(SOURCE) $(DEP_CPP_LNEAT) "$(INTDIR)"
......
......@@ -2,7 +2,7 @@
/* vim:set shiftwidth=4 ts=8: */
/*************************************************************************
* Copyright (c) 2011 AT&T Intellectual Property
* Copyright (c) 2011 AT&T Intellectual Property
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
......@@ -28,7 +28,7 @@
#include "color.h"
#include "colorprocs.h"
#ifdef MSWIN32
#ifdef _WIN32
#include <wincrypt.h>
#endif
......@@ -208,7 +208,7 @@ static v_data *makeGraph(Agraph_t* gg, int *nedges)
ne = 0;
i=0;
// for (i = 0; i < nv; i++) {
for (np = agfstnode(gg); np; np = agnxtnode(gg, np))
for (np = agfstnode(gg); np; np = agnxtnode(gg, np))
{
graph[i].edges = edges++; /* reserve space for the self loop */
graph[i].ewgts = ewgts++;
......@@ -219,7 +219,7 @@ static v_data *makeGraph(Agraph_t* gg, int *nedges)
if (!g)
g = agraphof(np);
for (ep = agfstedge(g, np); ep; ep = agnxtedge(g, ep, np))
for (ep = agfstedge(g, np); ep; ep = agnxtedge(g, ep, np))
{
Agnode_t *vp;
Agnode_t *tp = agtail(ep);
......@@ -274,7 +274,7 @@ static v_data *makeGraph_old(topview * tv, int *nedges)
np = tv->Nodes[i].Node;
if (!g)
g = agraphof(np);
for (ep = agfstedge(g, np); ep; ep = agnxtedge(g, ep, np))
for (ep = agfstedge(g, np); ep; ep = agnxtedge(g, ep, np))
{
Agnode_t *vp;
Agnode_t *tp = agtail(ep);
......@@ -343,7 +343,7 @@ void prepare_topological_fisheye(Agraph_t* g,topview * t)
// t->fisheyeParams.animate=1; //turn the animation on
i=0;
for (np = agfstnode(g); np; np = agnxtnode(g, np))
for (np = agfstnode(g); np; np = agnxtnode(g, np))
{
x_coords[i]=ND_A(np).x;
y_coords[i]=ND_A(np).y;
......@@ -371,7 +371,7 @@ void prepare_topological_fisheye(Agraph_t* g,topview * t)
(int) (view->bdyTop - view->bdyBottom);
view->Topview->fisheyeParams.repos.rescale = Polar;
//topological fisheye
//topological fisheye
colorxlate(get_attribute_value
("topologicalfisheyefinestcolor", view,
......@@ -586,7 +586,7 @@ static void drawtopfishedges(topview * t)
glVertex3f((GLfloat) x0, (GLfloat) y0,
(GLfloat) 0);
glVertex3f((GLfloat) x, (GLfloat) y, (GLfloat) 0);
} else // if (gg[n].active_level > level)
} else // if (gg[n].active_level > level)
{
int levell, nodee;
find_active_ancestor_info(hp, level, n, &levell,
......@@ -687,7 +687,7 @@ int get_temp_coords(topview * t, int level, int v, double *coord_x,
AL = gg[v].active_level;
OAL = gg[v].old_active_level;
if ((OAL < level) || (AL < level)) //no draw
if ((OAL < level) || (AL < level)) //no draw
return 0;
if ((OAL >= level) || (AL >= level)) //draw the node
{
......
......@@ -54,7 +54,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;MSWIN32;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
......@@ -79,7 +79,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\getopt;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\ingraphs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;MSWIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader />
<WarningLevel>Level4</WarningLevel>
<EnablePREfast>true</EnablePREfast>
......@@ -113,4 +113,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
\ No newline at end of file
</Project>
......@@ -89,7 +89,7 @@ link{
compile{
#include <iconv.h>
iconv_t xx;
iconv_t xx;
}end yes{
/* Define if <iconv.h> defines iconv_t. */
#define HAVE_ICONV_T_DEF 1
......@@ -97,7 +97,7 @@ compile{
compile{
#include <fenv.h>
void foo() {fesetenv (FE_NONIEEE_ENV);}
void foo() {fesetenv (FE_NONIEEE_ENV);}
}end yes{
/* Define if FE_NONIEEE_ENV defined in <fenv.h>. */
#define FE_NONIEEE_ENV 1
......@@ -140,7 +140,7 @@ cat{
#define HAVE_LIBM 1
/* Define if you have the png library (-lpng). */
#define HAVE_LIBPNG 1
#define HAVE_LIBPNG 1
/* Define if you have the freetype library (-lfreetype), */
#define HAVE_LIBFREETYPE 1
......@@ -175,21 +175,21 @@ cat{
/* Default DPI. */
#define DEFAULT_DPI 96
/* Define if you want SFDP. */
#define SFDP 1
/* Define if you want to use the triangle library. */
#define HAVE_TRIANGLE 1
#define VERSION "VVVV"
/* Define if you have the pango library with cairo support */
/* #define HAVE_PANGOCAIRO 1 */
/* Define if you want DIGCOLA */
/* Define if you want DIGCOLA */
#define DIGCOLA 1
/* Define if you want IPSEPCOLA */
/* Define if you want IPSEPCOLA */
#define IPSEPCOLA 1
/* #define MOSEK 1 */
......@@ -199,7 +199,7 @@ cat{
# define DEFAULT_FONTPATH "/win/fonts"
# define PATHSEPARATOR ":"
# else
# ifdef MSWIN32
# ifdef _WIN32
# define DEFAULT_FONTPATH "C:/WINDOWS/FONTS;C:/WINNT/Fonts;C:/winnt/fonts"
# define PATHSEPARATOR ";"
# else
......@@ -209,4 +209,3 @@ cat{
# endif
#endif
}end
This diff is collapsed.
......@@ -2,7 +2,7 @@
/* vim:set shiftwidth=4 ts=8: */
/*************************************************************************
* Copyright (c) 2011 AT&T Intellectual Property
* Copyright (c) 2011 AT&T Intellectual Property
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
......@@ -30,7 +30,7 @@ extern "C" {
#else
#define extern __declspec(dllimport)
#endif
#endif
#endif
extern box mkbox(point p, point q);
extern boxf mkboxf(pointf p, pointf q);
......@@ -52,7 +52,7 @@ extern void rect2poly(pointf *p);
extern int line_intersect (pointf a, pointf b, pointf c, pointf d, pointf* p);
#if defined(MSWIN32) || defined(_WIN32)
#if defined(_WIN32)
#define inline __inline
#endif
......@@ -150,7 +150,7 @@ static inline pointf mid_pointf(pointf p, pointf q)
static inline pointf interpolate_pointf(double t, pointf p, pointf q)
{
pointf r;
pointf r;
r.x = p.x + t * (q.x - p.x);
r.y = p.y + t * (q.y - p.y);
......
......@@ -263,7 +263,7 @@ Agraphinfo_t* GD_info(graph_t * g) { return ((Agraphinfo_t*)AGDATA(g));}
Agnodeinfo_t* ND_info(node_t * n) { return ((Agnodeinfo_t*)AGDATA(n));}
#endif
#if !defined(MSWIN32) && !defined(_WIN32)
#if !defined(_WIN32)
#include <pwd.h>
#if 0
......@@ -610,7 +610,7 @@ static int Tflag;
void gvToggle(int s)
{
Tflag = !Tflag;
#if !defined(MSWIN32) && !defined(_WIN32)
#if !defined(_WIN32)
signal(SIGUSR1, gvToggle);
#endif
}
......
#ifndef MSWIN32
#ifndef _WIN32
//#include <unistd.h>
#include <sys/types.h>
......@@ -19,7 +19,7 @@ typedef clock_t mytime_t;
#define DIFF_IN_SECS(S,T) ((S - T) / (double)CLOCKS_PER_SEC)
#endif
static mytime_t T;
......
......@@ -2,7 +2,7 @@
/* vim:set shiftwidth=4 ts=8: */
/*************************************************************************
* Copyright (c) 2011 AT&T Intellectual Property
* Copyright (c) 2011 AT&T Intellectual Property
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
......@@ -15,7 +15,7 @@
* Written by Emden R. Gansner
*
* Module for initial layout, using point nodes and ports.
*
*
* Note: If interior nodes are not connected, they tend to fly apart,
* despite being tied to port nodes. This occurs because, as initially
* coded, as the nodes tend to straighten into a line, the radius
......@@ -135,7 +135,7 @@ static void reset_params(void)
* layout parameters. If T0 is not set, we set it here
* based on the size of the graph. In this case, we
* return 1, so that fdp_tLayout can unset T0, to be
* reset by a recursive call to fdp_tLayout.
* reset by a recursive call to fdp_tLayout.
*/
static int init_params(graph_t * g, xparams * xpms)
{
......@@ -537,7 +537,7 @@ static pointf initPositions(graph_t * g, bport_t * pp)
if (T_smode == INIT_RANDOM)
local_seed = T_seed;
else {
#if defined(MSWIN32) || defined(_WIN32)
#if defined(_WIN32)
local_seed = time(NULL);
#else
local_seed = getpid() ^ time(NULL);
......@@ -546,7 +546,7 @@ static pointf initPositions(graph_t * g, bport_t * pp)
srand48(local_seed);
/* If ports, place ports on and nodes within an ellipse centered at origin
* with halfwidth Wd and halfheight Ht.
* with halfwidth Wd and halfheight Ht.
* If no ports, place nodes within a rectangle centered at origin
* with halfwidth Wd and halfheight Ht. Nodes with a given position
* are translated. Wd and Ht are set to contain all positioned points.
......
......@@ -41,7 +41,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&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\cairo;C:\gtk\include\freetype2;C:\gtk\include;&quot;$(SolutionDir)/libltdl&quot;;&quot;$(SolutionDir)/lib/neatogen&quot;;&quot;$(SolutionDir)/lib/agutil&quot;;&quot;$(SolutionDir)/windows/lib/cdt&quot;;&quot;$(SolutionDir)/&quot;;&quot;$(SolutionDir)/lib/graph&quot;;&quot;$(SolutionDir)/lib/vpsc&quot;;&quot;$(SolutionDir)/lib/vmalloc&quot;;&quot;$(SolutionDir)/lib/twopigen&quot;;&quot;$(SolutionDir)/lib/sparse&quot;;&quot;$(SolutionDir)/lib/sfio&quot;;&quot;$(SolutionDir)/lib/sfpdpgen&quot;;&quot;$(SolutionDir)/lib/rbtree&quot;;&quot;$(SolutionDir)/lib/pathplan&quot;;&quot;$(SolutionDir)/lib/patchwork&quot;;&quot;$(SolutionDir)/lib/pack&quot;;&quot;$(SolutionDir)/lib/ortho&quot;;&quot;$(SolutionDir)/lib/inkpot&quot;;&quot;$(SolutionDir)/lib/ingraphs&quot;;&quot;$(SolutionDir)/lib/gd&quot;;&quot;$(SolutionDir)/lib/filter&quot;;&quot;$(SolutionDir)/lib/fdpgen&quot;;&quot;$(SolutionDir)/lib/expr&quot;;&quot;$(SolutionDir)/lib/dotgen&quot;;&quot;$(SolutionDir)/lib/circogen&quot;;&quot;$(SolutionDir)/lib/ast&quot;;&quot;$(SolutionDir)/lib/common&quot;;&quot;$(SolutionDir)/lib/gvc&quot;;&quot;$(SolutionDir)/lib/cdt&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GRAPH_EXPORTS;MSWIN32;WIN32_DLL;HAVE_CONFIG_H"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GRAPH_EXPORTS;WIN32_DLL;HAVE_CONFIG_H"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
......@@ -118,7 +118,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="&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\cairo;C:\gtk\include\freetype2;C:\gtk\include;&quot;$(SolutionDir)/libltdl&quot;;&quot;$(SolutionDir)/lib/neatogen&quot;;&quot;$(SolutionDir)/lib/agutil&quot;;&quot;$(SolutionDir)/windows/lib/cdt&quot;;&quot;$(SolutionDir)/&quot;;&quot;$(SolutionDir)/lib/graph&quot;;&quot;$(SolutionDir)/lib/vpsc&quot;;&quot;$(SolutionDir)/lib/vmalloc&quot;;&quot;$(SolutionDir)/lib/twopigen&quot;;&quot;$(SolutionDir)/lib/sparse&quot;;&quot;$(SolutionDir)/lib/sfio&quot;;&quot;$(SolutionDir)/lib/sfpdpgen&quot;;&quot;$(SolutionDir)/lib/rbtree&quot;;&quot;$(SolutionDir)/lib/pathplan&quot;;&quot;$(SolutionDir)/lib/patchwork&quot;;&quot;$(SolutionDir)/lib/pack&quot;;&quot;$(SolutionDir)/lib/ortho&quot;;&quot;$(SolutionDir)/lib/inkpot&quot;;&quot;$(SolutionDir)/lib/ingraphs&quot;;&quot;$(SolutionDir)/lib/gd&quot;;&quot;$(SolutionDir)/lib/filter&quot;;&quot;$(SolutionDir)/lib/fdpgen&quot;;&quot;$(SolutionDir)/lib/expr&quot;;&quot;$(SolutionDir)/lib/dotgen&quot;;&quot;$(SolutionDir)/lib/circogen&quot;;&quot;$(SolutionDir)/lib/ast&quot;;&quot;$(SolutionDir)/lib/agraph&quot;;&quot;$(SolutionDir)/lib/common&quot;;&quot;$(SolutionDir)/lib/gvc&quot;;&quot;$(SolutionDir)/lib/cdt&quot;;&quot;$(SolutionDir)/lib/cgraph&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GRAPH_EXPORTS;MSWIN32;WIN32_DLL;HAVE_CONFIG_H"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GRAPH_EXPORTS;WIN32_DLL;HAVE_CONFIG_H"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="0"
......
......@@ -2,7 +2,7 @@
/* vim:set shiftwidth=4 ts=8: */
/*************************************************************************
* Copyright (c) 2011 AT&T Intellectual Property
* Copyright (c) 2011 AT&T Intellectual Property
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
......@@ -25,7 +25,7 @@ extern "C" {
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#if !defined(MSWIN32) && !defined(WIN32)
#if !defined(WIN32)
#include <unistd.h>
#endif
#endif
......
......@@ -52,7 +52,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)windows\include;$(SolutionDir)windows\dependencies\GTK2\include;$(SolutionDir)windows\dependencies\libraries\x86\include;$(SolutionDir);$(SolutionDir)lib\cdt;$(SolutionDir)lib\cgraph;$(SolutionDir)lib\common;$(SolutionDir)lib\fdpgen;$(SolutionDir)lib\label;$(SolutionDir)lib\pathplan;$(SolutionDir)lib\gvc;$(SolutionDir)lib\xdot;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>MSWIN32;WIN32;_DEBUG;_WINDOWS;_USRDLL;GVC_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GVC_EXPORTS;WIN32_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
......
......@@ -2,7 +2,7 @@
/* vim:set shiftwidth=4 ts=8: */
/*************************************************************************
* Copyright (c) 2011 AT&T Intellectual Property
* Copyright (c) 2011 AT&T Intellectual Property
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
......@@ -66,7 +66,7 @@ int user_pos(attrsym_t * posptr, attrsym_t * pinptr, node_t * np, int nG)
p = agxget(np, posptr);
if (p[0]) {
c = '\0';
if ((Ndim >= 3) &&
if ((Ndim >= 3) &&
(sscanf(p, "%lf,%lf,%lf%c", pvec, pvec+1, pvec+2, &c) >= 3)){
ND_pinned(np) = P_SET;
if (PSinputscale > 0.0) {
......@@ -88,7 +88,7 @@ int user_pos(attrsym_t * posptr, attrsym_t * pinptr, node_t * np, int nG)
pvec[i] = pvec[i] / PSinputscale;
}
if (Ndim > 2) {
if (N_z && (p = agxget(np, N_z)) && (sscanf(p,"%lf",&z) == 1)) {
if (N_z && (p = agxget(np, N_z)) && (sscanf(p,"%lf",&z) == 1)) {
if (PSinputscale > 0.0) {
pvec[2] = z / PSinputscale;
}
......@@ -432,7 +432,7 @@ static int chkBB(Agraph_t * g, attrsym_t * G_bb, boxf* bbp)
if (bb.LL.y > bb.UR.y) {
/* If the LL.y coordinate is bigger than the UR.y coordinate,
* we assume the input was produced using -y, so we normalize
* the bb.
* the bb.
*/
double tmp = bb.LL.y;
bb.LL.y = bb.UR.y;
......@@ -517,7 +517,7 @@ nop_init_graphs(Agraph_t * g, attrsym_t * G_lp, attrsym_t * G_bb)
* supply it.
*
* If adjust is false, init_nop does nothing but initialize all
* of the basic graph information. No tweaking of positions or
* of the basic graph information. No tweaking of positions or
* filling in edge splines is done.
*
* Returns 0 on normal success, 1 if layout has a background, and -1
......@@ -563,7 +563,7 @@ int init_nop(Agraph_t * g, int adjust)
if (didAdjust) {
if (GD_label(g)) GD_label(g)->set = FALSE;
/* FIX:
/* FIX:
* - if nodes are moved, clusters are no longer valid.
*/
}
......@@ -597,7 +597,7 @@ int init_nop(Agraph_t * g, int adjust)
}
if (posEdges != AllEdges)
spline_edges0(g, FALSE); /* add edges */
else
else
State = GVSPLINES;
}
......@@ -743,7 +743,7 @@ acyclic (vtx_data* graph, int nv, int mode, node_t* nodes[])
}
for (i = 0; i < nv; i++) {
if (ND_mark(nodes[i])) continue;
dfsCycle (graph, i, mode, nodes);
dfsCycle (graph, i, mode, nodes);
}
}
......@@ -761,7 +761,7 @@ acyclic (vtx_data* graph, int nv, int mode, node_t* nodes[])
* In constructing graph from g, we neglect loops. We track multiedges (ignoring
* direction). Edge weights are additive; the final edge length is the max.
*
* If direction is used, we set the edists field, -1 for tail, +1 for head.
* If direction is used, we set the edists field, -1 for tail, +1 for head.
* graph[i].edists[0] is left undefined. If multiedges exist, the direction
* of the first one encountered is used. Finally, a pass is made to guarantee
* the graph is acyclic.
......@@ -976,12 +976,12 @@ setSeed (graph_t * G, int dflt, long* seedp)
else if (isdigit(*(unsigned char *)p)) {
init = INIT_RANDOM;
}
if (init == INIT_RANDOM) {
long seed;
/* Check for seed value */
if (!isdigit(*(unsigned char *)p) || sscanf(p, "%ld", &seed) < 1) {
#if defined(MSWIN32) || defined(_WIN32)
#if defined(_WIN32)
seed = (unsigned) time(NULL);
#else
seed = (unsigned) getpid() ^ (unsigned) time(NULL);
......@@ -1018,7 +1018,7 @@ static int checkExp (graph_t * G)
* If start is random, returns INIT_RANDOM
* Set RNG seed
* else return default
*
*
*/
int checkStart(graph_t * G, int nG, int dflt)
{
......@@ -1026,7 +1026,7 @@ int checkStart(graph_t * G, int nG, int dflt)
int init;
seed = 1;
init = setSeed (G, dflt, &seed);
init = setSeed (G, dflt, &seed);
if (N_pos && (init != INIT_RANDOM)) {
agerr(AGWARN, "node positions are ignored unless start=random\n");
}
......@@ -1090,7 +1090,7 @@ void dumpClusterData (cluster_data* dp)
fprintf (stderr, " %d", dp->clusters[i][j]);
fprintf (stderr, "\n");
}
fprintf (stderr, "Toplevel:\n");
for (i = 0; i < dp->ntoplevel; i++)
......@@ -1136,7 +1136,7 @@ majorization(graph_t *mg, graph_t * g, int nv, int mode, int model, int dim, int
#endif
int init = checkStart(g, nv, (mode == MODE_HIER ? INIT_SELF : INIT_RANDOM));
int opts = checkExp (g);
if (init == INIT_SELF)
opts |= opt_smart_init;
......@@ -1162,10 +1162,10 @@ majorization(graph_t *mg, graph_t * g, int nv, int mode, int model, int dim, int
#ifdef DIGCOLA
if (mode != MODE_MAJOR) {
double lgap = late_double(g, agfindgraphattr(g, "levelsgap"), 0.0, -MAXDOUBLE);
if (mode == MODE_HIER) {
if (mode == MODE_HIER) {
rv = stress_majorization_with_hierarchy(gp, nv, ne, coords, nodes, Ndim,
opts, model, MaxIter, lgap);
}
}
#ifdef IPSEPCOLA
else {
char* str;
......@@ -1198,7 +1198,7 @@ majorization(graph_t *mg, graph_t * g, int nv, int mode, int model, int dim, int
opt.noverlap = 2;
if(Verbose)
fprintf(stderr,"Removing overlaps as postprocess...\n");
}
}
else opt.noverlap = 0;
#ifdef MOSEK
str = agget(g, "mosek");
......@@ -1335,7 +1335,7 @@ static void kkNeato(Agraph_t * g, int nG, int model)
/* neatoLayout:
* Use stress optimization to layout a single component
*/
static void
static void
neatoLayout(Agraph_t * mg, Agraph_t * g, int layoutMode, int layoutModel,
adjust_data* am)
{
......@@ -1359,7 +1359,7 @@ neatoLayout(Agraph_t * mg, Agraph_t * g, int layoutMode, int layoutModel,
}
/* addZ;
* If dimension == 3 and z attribute is declared,
* If dimension == 3 and z attribute is declared,
* attach z value to nodes if not defined.
*/
static void addZ (Agraph_t* g)
......@@ -1367,7 +1367,7 @@ static void addZ (Agraph_t* g)
node_t* n;
char buf[BUFSIZ];
if ((Ndim >= 3) && N_z) {
if ((Ndim >= 3) && N_z) {
for (n = agfstnode(g); n; n = agnxtnode(g, n)) {
sprintf(buf, "%lf", POINTS_PER_INCH * (ND_pos(n)[2]));
agxset(n, N_z, buf);
......@@ -1486,7 +1486,7 @@ void neato_layout(Agraph_t * g)
for (i = 0; i < n_cc; i++) {
gc = cc[i];
free_scan_graph(gc);
agdelrec (gc, "Agraphinfo_t");
agdelrec (gc, "Agraphinfo_t");
agdelete(g, gc);