From: Ian Abbott Date: Wed, 14 Sep 2011 08:53:31 +0000 (+0100) Subject: Rename some function parameters from 'register' to 'reg'. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3cdeb8d04b9cf67d4fe83ac1537fa13e68820d1d;p=comedi.git Rename some function parameters from 'register' to 'reg'. [Porting over relevant part of patch by Chris Peterson for Linux kernel sources.] Some function prototypes declare an 'int register' parameter. gcc -W warns "‘register’ is not at beginning of declaration" because the compiler thinks the parameter has been marked as a 'register' variable but the author just wanted to name the parameter "register" (which is a reserved keyword). --- diff --git a/comedi/drivers/ni_stc.h b/comedi/drivers/ni_stc.h index 0c869ada..8d5aa68d 100644 --- a/comedi/drivers/ni_stc.h +++ b/comedi/drivers/ni_stc.h @@ -1411,10 +1411,10 @@ typedef struct ni_board_struct { #define NUM_GPCT 2 #define NI_PRIVATE_COMMON \ - uint16_t (*stc_readw)(comedi_device *dev, int register); \ - uint32_t (*stc_readl)(comedi_device *dev, int register); \ - void (*stc_writew)(comedi_device *dev, uint16_t value, int register); \ - void (*stc_writel)(comedi_device *dev, uint32_t value, int register); \ + uint16_t (*stc_readw)(comedi_device *dev, int reg); \ + uint32_t (*stc_readl)(comedi_device *dev, int reg); \ + void (*stc_writew)(comedi_device *dev, uint16_t value, int reg); \ + void (*stc_writel)(comedi_device *dev, uint32_t value, int reg); \ \ unsigned short dio_output; \ unsigned short dio_control; \