aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2001-12-18 00:01:34 (GMT)
committerfluxgen <fluxgen>2001-12-18 00:01:34 (GMT)
commit69a4f16e5fba81f4124937758a86f0d3d7a02463 (patch)
tree49902bc8787035e531062d5897e9f6c25c361bed
parent07b8a8041c169fdb858a051bf431d643c7ae84b4 (diff)
downloadfluxbox_paul-69a4f16e5fba81f4124937758a86f0d3d7a02463.zip
fluxbox_paul-69a4f16e5fba81f4124937758a86f0d3d7a02463.tar.bz2
update
-rw-r--r--src/BaseDisplay.hh14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/BaseDisplay.hh b/src/BaseDisplay.hh
index 9148eff..84ae92e 100644
--- a/src/BaseDisplay.hh
+++ b/src/BaseDisplay.hh
@@ -1,3 +1,6 @@
1// BaseDisplay.hh for Fluxbox
2// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org
3//
1// BaseDisplay.hh for Blackbox - an X11 Window manager 4// BaseDisplay.hh for Blackbox - an X11 Window manager
2// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) 5// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
3// 6//
@@ -66,17 +69,6 @@ typedef struct _blackbox_attributes {
66void bexec(const char *, char *); 69void bexec(const char *, char *);
67#endif // !__EMX__ 70#endif // !__EMX__
68 71
69
70// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org)
71//
72// Screen.hh for Blackbox - an X11 Window manager
73// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
74//
75// Permission is hereby granted, free of charge, to any person obtaining a
76// copy of this software and associated documentation files (the "Software"),
77// to deal in the Software without restriction, including without limitation
78// the rights to use, copy, modify, merge, publish, distribute, sublicense,
79// and/or sell copies of the Softwar
80template <typename Z> inline Z min(Z a, Z b) { return ((a < b) ? a : b); } 72template <typename Z> inline Z min(Z a, Z b) { return ((a < b) ? a : b); }
81template <typename Z> inline Z max(Z a, Z b) { return ((a > b) ? a : b); } 73template <typename Z> inline Z max(Z a, Z b) { return ((a > b) ? a : b); }
82 74