Mercurial > dwindows

changeset 2161:a1bf891d5990

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mac: Switch to using cross platform DW_UNUSED() macro. Remove the Mac specific __DW_UNUSED__ macro.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Tue, 29 Sep 2020 22:54:26 +0000
parents 07f1366a724c
children a3f105431028
files mac/dw.m
diffstat 1 files changed, 6 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/mac/dw.m	Tue Sep 29 22:49:04 2020 +0000
+++ b/mac/dw.m	Tue Sep 29 22:54:26 2020 +0000
@@ -19,9 +19,6 @@
 #include <sys/stat.h>
 #include <math.h>
 
-/* This may move to dw.h for use on all platforms in the future */
-#define __DW_UNUSED__ __attribute__((unused))
-
 /* Create a define to let us know to include Snow Leopard specific features */
 #if defined(MAC_OS_X_VERSION_10_6) && ((defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6) || !defined(MAC_OS_X_VERSION_MAX_ALLOWED))
 #define BUILDING_FOR_SNOW_LEOPARD
@@ -7153,7 +7150,7 @@
 DW_FUNCTION_DEFINITION(dw_tree_get_title, char *, HWND handle, HTREEITEM item)
 DW_FUNCTION_ADD_PARAM2(handle, item)
 DW_FUNCTION_RETURN(dw_tree_get_title, char *)
-DW_FUNCTION_RESTORE_PARAM2(__DW_UNUSED__ handle, HWND, item, HTREEITEM)
+DW_FUNCTION_RESTORE_PARAM2(DW_UNUSED(handle), HWND, item, HTREEITEM)
 {
     DW_FUNCTION_INIT;
     char *retval = NULL;
@@ -7226,7 +7223,7 @@
 DW_FUNCTION_DEFINITION(dw_tree_item_set_data, void, HWND handle, HTREEITEM item, void *itemdata)
 DW_FUNCTION_ADD_PARAM3(handle, item, itemdata)
 DW_FUNCTION_NO_RETURN(dw_tree_item_set_data)
-DW_FUNCTION_RESTORE_PARAM3(__DW_UNUSED__ handle, HWND, item, HTREEITEM, itemdata, void *)
+DW_FUNCTION_RESTORE_PARAM3(DW_UNUSED(handle), HWND, item, HTREEITEM, itemdata, void *)
 {
     DW_FUNCTION_INIT;
     NSMutableArray *array = (NSMutableArray *)item;
@@ -7243,7 +7240,7 @@
 DW_FUNCTION_DEFINITION(dw_tree_item_get_data, void *, HWND handle, HTREEITEM item)
 DW_FUNCTION_ADD_PARAM2(handle, item)
 DW_FUNCTION_RETURN(dw_tree_item_get_data, void *)
-DW_FUNCTION_RESTORE_PARAM2(__DW_UNUSED__ handle, HWND, item, HTREEITEM)
+DW_FUNCTION_RESTORE_PARAM2(DW_UNUSED(handle), HWND, item, HTREEITEM)
 {
     DW_FUNCTION_INIT;
     void *result = NULL;
@@ -7378,7 +7375,7 @@
 DW_FUNCTION_DEFINITION(dw_container_setup, int, HWND handle, unsigned long *flags, char **titles, int count, int separator)
 DW_FUNCTION_ADD_PARAM5(handle, flags, titles, count, separator)
 DW_FUNCTION_RETURN(dw_container_setup, int)
-DW_FUNCTION_RESTORE_PARAM5(handle, HWND, flags, unsigned long *, titles, char **, count, int, __DW_UNUSED__ separator, int)
+DW_FUNCTION_RESTORE_PARAM5(handle, HWND, flags, unsigned long *, titles, char **, count, int, DW_UNUSED(separator), int)
 {
     DW_FUNCTION_INIT;
     int z, retval = DW_ERROR_NONE;
@@ -7824,7 +7821,7 @@
 DW_FUNCTION_DEFINITION(dw_container_insert, void, HWND handle, void *pointer, int rowcount)
 DW_FUNCTION_ADD_PARAM3(handle, pointer, rowcount)
 DW_FUNCTION_NO_RETURN(dw_container_insert)
-DW_FUNCTION_RESTORE_PARAM3(handle, HWND, __DW_UNUSED__ pointer, void *, __DW_UNUSED__ rowcount, int)
+DW_FUNCTION_RESTORE_PARAM3(handle, HWND, DW_UNUSED(pointer), void *, DW_UNUSED(rowcount), int)
 {
     DW_FUNCTION_INIT;
     DWContainer *cont = handle;
@@ -8982,7 +8979,7 @@
 DW_FUNCTION_DEFINITION(dw_html_new, HWND, ULONG cid)
 DW_FUNCTION_ADD_PARAM1(cid)
 DW_FUNCTION_RETURN(dw_html_new, HWND)
-DW_FUNCTION_RESTORE_PARAM1(__DW_UNUSED__ cid, ULONG)
+DW_FUNCTION_RESTORE_PARAM1(DW_UNUSED(cid), ULONG)
 {
     DW_FUNCTION_INIT;
     DWWebView *web = [[DWWebView alloc] init];