diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-06-16 23:23:31 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-06-16 23:23:31 +0000 |
| commit | 1bb56fb39d8db0c9a419818f82fa7e517cad55bc (patch) | |
| tree | c6d5b6911e4ae7c85e4aa0b2f7a07c387c618d38 /nuttx/fs | |
| parent | 731994d0383c636e43644c3dc91b91b15745b345 (diff) | |
| download | px4-nuttx-1bb56fb39d8db0c9a419818f82fa7e517cad55bc.tar.gz px4-nuttx-1bb56fb39d8db0c9a419818f82fa7e517cad55bc.tar.bz2 px4-nuttx-1bb56fb39d8db0c9a419818f82fa7e517cad55bc.zip | |
Reserved word 'private' in C header files is a problem for C++
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1890 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/fs')
| -rw-r--r-- | nuttx/fs/fs_poll.c | 4 | ||||
| -rw-r--r-- | nuttx/fs/fs_registerblockdriver.c | 6 | ||||
| -rw-r--r-- | nuttx/fs/fs_registerdriver.c | 9 |
3 files changed, 9 insertions, 10 deletions
diff --git a/nuttx/fs/fs_poll.c b/nuttx/fs/fs_poll.c index c9b418453..dd71bfa48 100644 --- a/nuttx/fs/fs_poll.c +++ b/nuttx/fs/fs_poll.c @@ -1,7 +1,7 @@ /**************************************************************************** * fs/fs_poll.c * - * Copyright (C) 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -165,7 +165,7 @@ static inline int poll_setup(FAR struct pollfd *fds, nfds_t nfds, sem_t *sem) fds[i].sem = sem; fds[i].revents = 0; - fds[i].private = NULL; + fds[i].priv = NULL; /* Set up the poll */ diff --git a/nuttx/fs/fs_registerblockdriver.c b/nuttx/fs/fs_registerblockdriver.c index b4d89e773..aad6a9224 100644 --- a/nuttx/fs/fs_registerblockdriver.c +++ b/nuttx/fs/fs_registerblockdriver.c @@ -1,7 +1,7 @@ /**************************************************************************** * fs_registerblockdriver.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -69,7 +69,7 @@ STATUS register_blockdriver(const char *path, const struct block_operations *bops, - mode_t mode, void *private) + mode_t mode, void *priv) { struct inode *node; STATUS ret = -ENOMEM; @@ -93,7 +93,7 @@ STATUS register_blockdriver(const char *path, #ifdef CONFIG_FILE_MODE node->i_mode = mode; #endif - node->i_private = private; + node->i_private = priv; ret = OK; } diff --git a/nuttx/fs/fs_registerdriver.c b/nuttx/fs/fs_registerdriver.c index aedf06caf..5299ba28d 100644 --- a/nuttx/fs/fs_registerdriver.c +++ b/nuttx/fs/fs_registerdriver.c @@ -1,7 +1,7 @@ /**************************************************************************** * fs/fs_registerdriver.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -67,9 +67,8 @@ * Name: register_driver ****************************************************************************/ -STATUS register_driver(const char *path, - const struct file_operations *fops, - mode_t mode, void *private) +STATUS register_driver(const char *path, const struct file_operations *fops, + mode_t mode, void *priv) { struct inode *node; STATUS ret = ERROR; @@ -92,7 +91,7 @@ STATUS register_driver(const char *path, #ifdef CONFIG_FILE_MODE node->i_mode = mode; #endif - node->i_private = private; + node->i_private = priv; ret = OK; } |