Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 81fecd367b016e5ac4fb0c04b84da5c474f30da6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Peter Urbanec <git.user@urbanec.net> |
| 3 | Date: Fri, 27 Feb 2015 01:16:58 +1100 |
| 4 | Subject: [PATCH 1/1] gstinfo: Shorten __FILE__ on all platforms. |
| 5 | |
| 6 | This is useful not only for MSVC, but also with gcc/Linux when doing |
| 7 | cross-compilation builds and out-of-tree builds. |
| 8 | |
| 9 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=745213] |
| 10 | |
| 11 | Signed-off-by: Peter Urbanec <git.user@urbanec.net> |
| 12 | --- |
| 13 | gst/gstinfo.c | 11 ++++------- |
| 14 | 1 file changed, 4 insertions(+), 7 deletions(-) |
| 15 | |
| 16 | diff --git a/gst/gstinfo.c b/gst/gstinfo.c |
| 17 | index b2a3005..8b61d09 100644 |
| 18 | --- a/gst/gstinfo.c |
| 19 | +++ b/gst/gstinfo.c |
| 20 | @@ -444,7 +444,6 @@ gst_debug_log (GstDebugCategory * category, GstDebugLevel level, |
| 21 | va_end (var_args); |
| 22 | } |
| 23 | |
| 24 | -#ifdef G_OS_WIN32 |
| 25 | /* based on g_basename(), which we can't use because it was deprecated */ |
| 26 | static inline const gchar * |
| 27 | gst_path_basename (const gchar * file_name) |
| 28 | @@ -467,7 +466,6 @@ gst_path_basename (const gchar * file_name) |
| 29 | |
| 30 | return file_name; |
| 31 | } |
| 32 | -#endif |
| 33 | |
| 34 | /** |
| 35 | * gst_debug_log_valist: |
| 36 | @@ -497,12 +495,11 @@ gst_debug_log_valist (GstDebugCategory * category, GstDebugLevel level, |
| 37 | g_return_if_fail (function != NULL); |
| 38 | g_return_if_fail (format != NULL); |
| 39 | |
| 40 | - /* The predefined macro __FILE__ is always the exact path given to the |
| 41 | - * compiler with MSVC, which may or may not be the basename. We work |
| 42 | - * around it at runtime to improve the readability. */ |
| 43 | -#ifdef G_OS_WIN32 |
| 44 | + /* The predefined macro __FILE__ can be an absolute path in some build |
| 45 | + * environments, such as MSVC or out-of-tree cross-compiles. This may |
| 46 | + * be significantly longer than the filename. We work around it at |
| 47 | + * runtime to improve the readability. */ |
| 48 | file = gst_path_basename (file); |
| 49 | -#endif |
| 50 | |
| 51 | message.message = NULL; |
| 52 | message.format = format; |
| 53 | -- |
| 54 | 2.3.0 |
| 55 | |