diff options
Diffstat (limited to 'src/mga_merge.c')
| -rw-r--r-- | src/mga_merge.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mga_merge.c b/src/mga_merge.c index fee6290..64c85b4 100644 --- a/src/mga_merge.c +++ b/src/mga_merge.c @@ -18,12 +18,12 @@ #include "fbdevhw.h" static int -StrToRanges(range* r, char* s) { +StrToRanges(range* r, const char* s) { float num=0.0; int rangenum=0; Bool gotdash = FALSE; Bool nextdash = FALSE; - char* strnum=NULL; + const char* strnum=NULL; do { switch(*s) { case '0': case '1': case '2': case '3': case '4': case '5': @@ -117,7 +117,7 @@ CopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest, DisplayModePtr i, DisplayM } static DisplayModePtr -GetModeFromName(char* str, DisplayModePtr i) +GetModeFromName(const char* str, DisplayModePtr i) { DisplayModePtr c = i; if(!i) return NULL; @@ -130,9 +130,9 @@ GetModeFromName(char* str, DisplayModePtr i) /* takes a config file string of MetaModes and generates a MetaModeList */ static DisplayModePtr -GenerateModeList(ScrnInfoPtr pScrn, char* str, +GenerateModeList(ScrnInfoPtr pScrn, const char* str, DisplayModePtr i, DisplayModePtr j, MgaScrn2Rel srel) { - char* strmode = str; + const char* strmode = str; char modename[256]; Bool gotdash = FALSE; MgaScrn2Rel sr; @@ -165,7 +165,7 @@ GenerateModeList(ScrnInfoPtr pScrn, char* str, } else { mode1 = GetModeFromName(modename,i); if(!mode1) { - char* tmps = str; + const char* tmps = str; xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Mode: \"%s\" is not a supported mode for monitor 1\n",modename); /* find if a monitor2 mode follows */ @@ -232,7 +232,7 @@ MGAPreInitMergedFB(ScrnInfoPtr pScrn1, int flags) MGAPtr pMga1; MessageType from; int i; - char* s; + const char* s; ClockRangePtr clockRanges; MgaScrn2Rel Monitor2Pos; |