← Back to branch summary

~ubuntu-branches/ubuntu/precise/ivtools/precise

~ubuntu-branches/ubuntu/precise/ivtools/precise

« back to all changes in this revision

Viewing changes to src/ComUtil/util.h

Committer: Bazaar Package Importer
Author(s): Luca Falavigna
Date: 2008-05-23 12:42:28 UTC
mfrom: (2.1.2 sid)
Revision ID: james.westby@ubuntu.com-20080523124228-5j6pysoiflt9sbf9

Tags: 1.1.3-5.4ubuntu1

* Merge from Debian unstable, remaining Ubuntu changes:
- debian/template: retain use of /etc/X11.
- debian/control: update Maintainer field as per spec.

files removed:
debian/ivtools-unidrawc2a.files

files modified:
Makefile

config/config-linux-gcc.defs

config/config.mk

debian/changelog

debian/control

debian/rules

src/AttrGlyph/attredit.c

src/Attribute/attrlist.c

src/Attribute/paramlist.c

src/ComGlyph/comtextview.c

src/ComTerp/assignfunc.c

src/ComTerp/comterp.c

src/ComTerp/ctrlfunc.c

src/ComTerp/debugfunc.c

src/ComTerp/dotfunc.c

src/ComTerp/helpfunc.c

src/ComTerp/iofunc.c

src/ComUnidraw/comeditor.c

src/ComUnidraw/grdotfunc.c

src/ComUnidraw/plotfunc.c

src/ComUnidraw/unifunc.c

src/ComUtil/atox.c

src/ComUtil/errsys.c

src/ComUtil/optable.c

src/ComUtil/util.h

src/DrawServ/drawcomps.c

src/DrawServ/drawfunc.c

src/FrameUnidraw/framefile.c

src/FrameUnidraw/framefunc.c

src/FrameUnidraw/framescripts.c

src/GraphUnidraw/nodecomp.c

src/IV-X11/xfont.c

src/IV-X11/xraster.c

src/IV-X11/xwindow.c

src/IV-common/regexp.c

src/IV-common/string.c

src/IVGlyph/bdfltform.c

src/IVGlyph/bdvalue.c

src/IVGlyph/fieldedit.c

src/IVGlyph/figure.h

src/IVGlyph/textview.c

src/IVGlyph/valuator.c

src/InterViews/fchooser.c

src/InterViews/field.c

src/InterViews/kit.c

src/InterViews/ol_kit.c

src/InterViews/regexp.c

src/InterViews/session.c

src/OS/file.c

src/OS/string.c

src/OverlayUnidraw/ovarrow.c

src/OverlayUnidraw/ovcatalog.c

src/OverlayUnidraw/ovcmds.c

src/OverlayUnidraw/ovcomps.c

src/OverlayUnidraw/oved.c

src/OverlayUnidraw/ovfile.c

src/OverlayUnidraw/ovimport.c

src/OverlayUnidraw/ovline.c

src/OverlayUnidraw/ovpolygon.c

src/OverlayUnidraw/ovraster.c

src/OverlayUnidraw/ovraster.h

src/OverlayUnidraw/ovspline.c

src/OverlayUnidraw/ovstates.c

src/OverlayUnidraw/ovstencil.c

src/OverlayUnidraw/scriptview.c

src/Time/Date.c

src/Time/Time.c

src/Time/Time.h

src/UniIdraw/idcatalog.c

src/UniIdraw/ided.c

src/Unidraw/catalog.c

src/Unidraw/csolver.c

src/Unidraw/gvupdater.c

src/Unidraw/import.c

src/Unidraw/selection.c

src/Unidraw/stateview.c

src/Unidraw/stateviews.c

src/comdraw/main.c

src/comtest/main.c

src/drawserv_/main.c

src/drawtool/main.c

src/flipbook/main.c

src/graphdraw/main.c

src/iclass/main.c

src/idemo/main.c

src/idraw/main.c

src/include/InterViews/raster.h

src/include/ivstd/fstream.h

src/include/ivstd/iostream.h

Show diffs side-by-side

added added

removed removed

src/ComUtil/util.h

114

114

extern int TITLE;

115

115

#endif

116

116

117

#if !defined(min) && !defined(COMUTIL_NOMINMAXDEF)

118

#define min(a,b) (a<b?a:b)

117

#if !defined(my_min) && !defined(COMUTIL_NOMINMAXDEF)

118

#define my_min(a,b) (a<b?a:b)

119

119

#endif

120

#if !defined(max) && !defined(COMUTIL_NOMINMAXDEF)

121

#define max(a,b) (a>b?a:b)

120

#if !defined(my_max) && !defined(COMUTIL_NOMINMAXDEF)

121

#define my_max(a,b) (a>b?a:b)

122

122

#endif

123

123

124

124

/* Return Status for functions */

Older »