summaryrefslogtreecommitdiff
path: root/fb
diff options
context:
space:
mode:
authorTomas Carnecky <tom@dbservice.com>2008-08-28 18:05:40 -0400
committerEamon Walsh <ewalsh@tycho.nsa.gov>2008-08-28 18:05:40 -0400
commitebea78cdba0ff14a397239ee1936bd254c181e1b (patch)
tree3937720753cc112aaf9eb71ba0dcb39674362b98 /fb
parentec7907f8fa04dcff2649cc4846975844314f737e (diff)
Prepare for array-index based devPrivates.
TODO: static indices can be made just an int; some indices can be combined.
Diffstat (limited to 'fb')
-rw-r--r--fb/fballpriv.c11
-rw-r--r--fb/fboverlay.c3
2 files changed, 10 insertions, 4 deletions
diff --git a/fb/fballpriv.c b/fb/fballpriv.c
index 2e77289bb..c40796c11 100644
--- a/fb/fballpriv.c
+++ b/fb/fballpriv.c
@@ -27,18 +27,23 @@
#include "fb.h"
#ifdef FB_SCREEN_PRIVATE
-static DevPrivateKey fbScreenPrivateKey = &fbScreenPrivateKey;
+static int fbScreenPrivateKeyIndex;
+static DevPrivateKey fbScreenPrivateKey = &fbScreenPrivateKeyIndex;
DevPrivateKey fbGetScreenPrivateKey(void)
{
return fbScreenPrivateKey;
}
#endif
-static DevPrivateKey fbGCPrivateKey = &fbGCPrivateKey;
+
+static int fbGCPrivateKeyIndex;
+static DevPrivateKey fbGCPrivateKey = &fbGCPrivateKeyIndex;
DevPrivateKey fbGetGCPrivateKey(void)
{
return fbGCPrivateKey;
}
-static DevPrivateKey fbWinPrivateKey = &fbWinPrivateKey;
+
+static int fbWinPrivateKeyIndex;
+static DevPrivateKey fbWinPrivateKey = &fbWinPrivateKeyIndex;
DevPrivateKey fbGetWinPrivateKey(void)
{
return fbWinPrivateKey;
diff --git a/fb/fboverlay.c b/fb/fboverlay.c
index f9f7c52a3..1432cb6f0 100644
--- a/fb/fboverlay.c
+++ b/fb/fboverlay.c
@@ -33,7 +33,8 @@
#include "fboverlay.h"
#include "shmint.h"
-static DevPrivateKey fbOverlayScreenPrivateKey = &fbOverlayScreenPrivateKey;
+static int fbOverlayScreenPrivateKeyIndex;
+static DevPrivateKey fbOverlayScreenPrivateKey = &fbOverlayScreenPrivateKeyIndex;
DevPrivateKey fbOverlayGetScreenPrivateKey(void)
{