diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-05 17:44:57 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-05 17:44:57 +0200 |
| commit | 8af87a5b60e37ae84fdd759e2c1602be38be4905 (patch) | |
| tree | 2e621c7fbdc4dfe9eb8d733af4cc232bc03643d4 /X11/xtrans/Xtrans.h | |
| parent | 8238de0fe0c28bd54b3e6cdd1fc94513cf21d3cc (diff) | |
| parent | f7025b4baa1ba35ee796785641f04eac5bedb0a6 (diff) | |
| download | vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.tar.gz vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.tar.bz2 vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
mesalib/src/mesa/main/syncobj.h
xorg-server/dix/events.c
xorg-server/dix/getevents.c
xorg-server/include/misc.h
Diffstat (limited to 'X11/xtrans/Xtrans.h')
| -rw-r--r-- | X11/xtrans/Xtrans.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/X11/xtrans/Xtrans.h b/X11/xtrans/Xtrans.h index 6f8f909c8..2945b2aba 100644 --- a/X11/xtrans/Xtrans.h +++ b/X11/xtrans/Xtrans.h @@ -70,14 +70,14 @@ from The Open Group. #ifdef X11_t #define TRANS(func) _X11Trans##func #ifdef XTRANSDEBUG -static char* __xtransname = "_X11Trans"; +static const char *__xtransname = "_X11Trans"; #endif #endif /* X11_t */ #ifdef XSERV_t #define TRANS(func) _XSERVTrans##func #ifdef XTRANSDEBUG -static char* __xtransname = "_XSERVTrans"; +static const char *__xtransname = "_XSERVTrans"; #endif #define X11_t #endif /* XSERV_t */ @@ -85,35 +85,35 @@ static char* __xtransname = "_XSERVTrans"; #ifdef XIM_t #define TRANS(func) _XimXTrans##func #ifdef XTRANSDEBUG -static char* __xtransname = "_XimTrans"; +static const char *__xtransname = "_XimTrans"; #endif #endif /* XIM_t */ #ifdef FS_t #define TRANS(func) _FSTrans##func #ifdef XTRANSDEBUG -static char* __xtransname = "_FSTrans"; +static const char *__xtransname = "_FSTrans"; #endif #endif /* FS_t */ #ifdef FONT_t #define TRANS(func) _FontTrans##func #ifdef XTRANSDEBUG -static char* __xtransname = "_FontTrans"; +static const char *__xtransname = "_FontTrans"; #endif #endif /* FONT_t */ #ifdef ICE_t #define TRANS(func) _IceTrans##func #ifdef XTRANSDEBUG -static char* __xtransname = "_IceTrans"; +static const char *__xtransname = "_IceTrans"; #endif #endif /* ICE_t */ #ifdef TEST_t #define TRANS(func) _TESTTrans##func #ifdef XTRANSDEBUG -static char* __xtransname = "_TESTTrans"; +static const char *__xtransname = "_TESTTrans"; #endif #endif /* TEST_t */ @@ -121,14 +121,14 @@ static char* __xtransname = "_TESTTrans"; #define TRANS(func) _LBXPROXYTrans##func #define X11_t /* The server defines this - so should the LBX proxy */ #ifdef XTRANSDEBUG -static char* __xtransname = "_LBXPROXYTrans"; +static const char *__xtransname = "_LBXPROXYTrans"; #endif #endif /* LBXPROXY_t */ #if !defined(TRANS) #define TRANS(func) _XTrans##func #ifdef XTRANSDEBUG -static char* __xtransname = "_XTrans"; +static const char *__xtransname = "_XTrans"; #endif #endif /* !TRANS */ @@ -304,7 +304,7 @@ int TRANS(CreateListener)( ); int TRANS(NoListen) ( - char* /* protocol*/ + const char* /* protocol*/ ); int TRANS(ResetListener)( |