summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2009-04-03 22:27:51 -0400
committerAdam Jackson <ajax@redhat.com>2009-04-03 22:27:51 -0400
commit472811dc4ba741ab09db184216878700f4adf745 (patch)
tree4c0c9b5315427800b5a60d5c973b137f883d8280
parentcbb165ab88cb0810268001e84d87671440baf837 (diff)
DPMS: Re-export the various DPMS variables.
The drivers might not need them but extmod does. Should move it to builtin though.
-rw-r--r--Xext/Makefile.am2
-rw-r--r--include/globals.h14
2 files changed, 8 insertions, 8 deletions
diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index ac45f955a..21c858626 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -113,7 +113,7 @@ endif
# DPMS extension
DPMS_SRCS = dpms.c dpmsproc.h
if DPMSExtension
-MODULE_SRCS += $(DPMS_SRCS)
+BUILTIN_SRCS += $(DPMS_SRCS)
endif
# Now take all of the above, mix well, bake for 10 minutes and get libXext*.la
diff --git a/include/globals.h b/include/globals.h
index a7ef48a54..52c19a490 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -28,13 +28,13 @@ extern _X_EXPORT DDXPointRec dixScreenOrigins[MAXSCREENS];
extern _X_EXPORT char *ConnectionInfo;
#ifdef DPMSExtension
-extern CARD32 DPMSStandbyTime;
-extern CARD32 DPMSSuspendTime;
-extern CARD32 DPMSOffTime;
-extern CARD16 DPMSPowerLevel;
-extern Bool DPMSEnabled;
-extern Bool DPMSDisabledSwitch;
-extern Bool DPMSCapableFlag;
+extern _X_EXPORT CARD32 DPMSStandbyTime;
+extern _X_EXPORT CARD32 DPMSSuspendTime;
+extern _X_EXPORT CARD32 DPMSOffTime;
+extern _X_EXPORT CARD16 DPMSPowerLevel;
+extern _X_EXPORT Bool DPMSEnabled;
+extern _X_EXPORT Bool DPMSDisabledSwitch;
+extern _X_EXPORT Bool DPMSCapableFlag;
#endif
#ifdef PANORAMIX