diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-29 16:21:42 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-29 16:21:42 +0200 |
| commit | 4a9e1f51655e03da1507dabce7c4c3960e7ca607 (patch) | |
| tree | 0298f6e38550e2f888eab0146ce7a51a49faaa10 /apps | |
| parent | 0e68f72b7b0ab957a0d3c9415f68e3c4f484b0b3 (diff) | |
| parent | bee9191042416cbfb848615189ca1e2a0069f022 (diff) | |
| download | vcxsrv-4a9e1f51655e03da1507dabce7c4c3960e7ca607.tar.gz vcxsrv-4a9e1f51655e03da1507dabce7c4c3960e7ca607.tar.bz2 vcxsrv-4a9e1f51655e03da1507dabce7c4c3960e7ca607.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/xwininfo/dsimple.c | 4 | ||||
| -rw-r--r-- | apps/xwininfo/dsimple.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/xwininfo/dsimple.c b/apps/xwininfo/dsimple.c index 8a5d7cbeb..23b81848a 100644 --- a/apps/xwininfo/dsimple.c +++ b/apps/xwininfo/dsimple.c @@ -76,7 +76,7 @@ from The Open Group. /* This stuff is defined in the calling program by dsimple.h */ -char *program_name = "unknown_program"; +const char *program_name = "unknown_program"; /* * Get_Display_Name (argc, argv) - return string representing display name @@ -404,7 +404,7 @@ Window_With_Name ( /* * Standard fatal error routine - call like printf */ -void Fatal_Error (char *msg, ...) +void Fatal_Error (const char *msg, ...) { va_list args; fflush (stdout); diff --git a/apps/xwininfo/dsimple.h b/apps/xwininfo/dsimple.h index d5aff6cfe..d0dd71ae9 100644 --- a/apps/xwininfo/dsimple.h +++ b/apps/xwininfo/dsimple.h @@ -44,7 +44,7 @@ typedef int Bool; #define True 1 /* Global variables used by routines in dsimple.c */ -extern char *program_name; /* Name of this program */ +extern const char *program_name; /* Name of this program */ /* Declarations for functions in dsimple.c */ @@ -55,7 +55,7 @@ void Setup_Display_And_Screen (const char *displayname, xcb_window_t Select_Window (xcb_connection_t *, const xcb_screen_t *, int); xcb_window_t Window_With_Name (xcb_connection_t *, xcb_window_t, const char *); -void Fatal_Error (char *, ...) _X_NORETURN _X_ATTRIBUTE_PRINTF(1, 2); +void Fatal_Error (const char *, ...) _X_NORETURN _X_ATTRIBUTE_PRINTF(1, 2); void Print_X_Error (xcb_connection_t *, xcb_generic_error_t *); |