A massive all-tree automated update of all double inclusion guard #defines that changes from using two underscores as a prefix, which are reserved, to not using two underscores as a prefix
This commit is contained in:
Adam Dunkels
parent
42cae1c6c9
commit
bb2dcaa057
572 changed files with 1708 additions and 1708 deletions
|
|
@ -51,8 +51,8 @@
|
|||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
*/
|
||||
#ifndef __CRC16_H__
|
||||
#define __CRC16_H__
|
||||
#ifndef CRC16_H_
|
||||
#define CRC16_H_
|
||||
|
||||
/**
|
||||
* \brief Update an accumulated CRC16 checksum with one byte.
|
||||
|
|
@ -89,7 +89,7 @@ unsigned short crc16_add(unsigned char b, unsigned short crc);
|
|||
unsigned short crc16_data(const unsigned char *data, int datalen,
|
||||
unsigned short acc);
|
||||
|
||||
#endif /* __CRC16_H__ */
|
||||
#endif /* CRC16_H_ */
|
||||
|
||||
/** @} */
|
||||
/** @} */
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@
|
|||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
*/
|
||||
#ifndef __CTK_FILEDIALOG_H__
|
||||
#define __CTK_FILEDIALOG_H__
|
||||
#ifndef CTK_FILEDIALOG_H_
|
||||
#define CTK_FILEDIALOG_H_
|
||||
|
||||
#include "contiki.h"
|
||||
|
||||
|
|
@ -47,4 +47,4 @@ void ctk_filedialog_open(CC_REGISTER_ARG struct ctk_filedialog_state *s,
|
|||
char ctk_filedialog_eventhandler(struct ctk_filedialog_state *s,
|
||||
process_event_t ev, process_data_t data);
|
||||
|
||||
#endif /* __CTK_FILEDIALOG_H__ */
|
||||
#endif /* CTK_FILEDIALOG_H_ */
|
||||
|
|
|
|||
|
|
@ -31,10 +31,10 @@
|
|||
*
|
||||
*
|
||||
*/
|
||||
#ifndef __CTK_TEXTENTRY_CHECKBOX_H__
|
||||
#define __CTK_TEXTENTRY_CHECKBOX_H__
|
||||
#ifndef CTK_TEXTENTRY_CHECKBOX_H_
|
||||
#define CTK_TEXTENTRY_CHECKBOX_H_
|
||||
|
||||
unsigned char ctk_textentry_checkbox_input(ctk_arch_key_t c,
|
||||
struct ctk_textentry *t);
|
||||
|
||||
#endif /* __CTK_TEXTENTRY_CHECKBOX_H__ */
|
||||
#endif /* CTK_TEXTENTRY_CHECKBOX_H_ */
|
||||
|
|
|
|||
|
|
@ -31,12 +31,12 @@
|
|||
*
|
||||
*
|
||||
*/
|
||||
#ifndef __CTK_TEXTENTRY_CMDLINE_H__
|
||||
#define __CTK_TEXTENTRY_CMDLINE_H__
|
||||
#ifndef CTK_TEXTENTRY_CMDLINE_H_
|
||||
#define CTK_TEXTENTRY_CMDLINE_H_
|
||||
|
||||
#include "ctk/ctk.h"
|
||||
|
||||
unsigned char ctk_textentry_cmdline_input(ctk_arch_key_t c,
|
||||
struct ctk_textentry *t);
|
||||
|
||||
#endif /* __CTK_TEXTENTRY_CMDLINE_H__ */
|
||||
#endif /* CTK_TEXTENTRY_CMDLINE_H_ */
|
||||
|
|
|
|||
|
|
@ -31,10 +31,10 @@
|
|||
*
|
||||
*
|
||||
*/
|
||||
#ifndef __CTK_TEXTENTRY_MULTILINE_H__
|
||||
#define __CTK_TEXTENTRY_MULTILINE_H__
|
||||
#ifndef CTK_TEXTENTRY_MULTILINE_H_
|
||||
#define CTK_TEXTENTRY_MULTILINE_H_
|
||||
|
||||
unsigned char ctk_textentry_multiline_input(ctk_arch_key_t c,
|
||||
struct ctk_textentry *t);
|
||||
|
||||
#endif /* __CTK_TEXTENTRY_MULTILINE_H__ */
|
||||
#endif /* CTK_TEXTENTRY_MULTILINE_H_ */
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@
|
|||
* $Revision: 1.1 $
|
||||
*/
|
||||
|
||||
#ifndef __GCR_H__
|
||||
#define __GCR_H__
|
||||
#ifndef GCR_H_
|
||||
#define GCR_H_
|
||||
|
||||
void gcr_init();
|
||||
unsigned char gcr_finished();
|
||||
|
|
@ -48,4 +48,4 @@ unsigned char gcr_get_encoded(unsigned char *raw_data);
|
|||
unsigned char gcr_get_decoded(unsigned char *raw_data);
|
||||
unsigned char gcr_valid();
|
||||
|
||||
#endif /* __GCR_H__ */
|
||||
#endif /* GCR_H_ */
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#ifndef __LIBCONIO_H__
|
||||
#define __LIBCONIO_H__
|
||||
#ifndef LIBCONIO_H_
|
||||
#define LIBCONIO_H_
|
||||
|
||||
/* This function must be implemented specifically for the
|
||||
architecture: */
|
||||
|
|
@ -81,4 +81,4 @@ void textcolor(unsigned char c);
|
|||
|
||||
|
||||
|
||||
#endif /* __LIBCONIO_H__ */
|
||||
#endif /* LIBCONIO_H_ */
|
||||
|
|
|
|||
|
|
@ -65,8 +65,8 @@
|
|||
* Author: Adam Dunkels <adam@sics.se>
|
||||
*
|
||||
*/
|
||||
#ifndef __LIST_H__
|
||||
#define __LIST_H__
|
||||
#ifndef LIST_H_
|
||||
#define LIST_H_
|
||||
|
||||
#define LIST_CONCAT2(s1, s2) s1##s2
|
||||
#define LIST_CONCAT(s1, s2) LIST_CONCAT2(s1, s2)
|
||||
|
|
@ -153,7 +153,7 @@ void list_insert(list_t list, void *previtem, void *newitem);
|
|||
|
||||
void * list_item_next(void *item);
|
||||
|
||||
#endif /* __LIST_H__ */
|
||||
#endif /* LIST_H_ */
|
||||
|
||||
/** @} */
|
||||
/** @} */
|
||||
|
|
|
|||
|
|
@ -61,15 +61,15 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#ifndef __ME_H__
|
||||
#define __ME_H__
|
||||
#ifndef ME_H_
|
||||
#define ME_H_
|
||||
|
||||
unsigned char me_valid(unsigned char m);
|
||||
unsigned short me_encode(unsigned char c);
|
||||
unsigned char me_decode16(unsigned short m);
|
||||
unsigned char me_decode8(unsigned char m);
|
||||
|
||||
#endif /* __ME_H__ */
|
||||
#endif /* ME_H_ */
|
||||
|
||||
/** @} */
|
||||
/** @} */
|
||||
|
|
|
|||
|
|
@ -29,12 +29,12 @@
|
|||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
*/
|
||||
#ifndef __ME_TABS_H__
|
||||
#define __ME_TABS_H__
|
||||
#ifndef ME_TABS_H_
|
||||
#define ME_TABS_H_
|
||||
|
||||
extern const unsigned short me_encode_tab[256];
|
||||
extern const unsigned char me_decode_tab[256];
|
||||
extern const unsigned char me_valid_tab[256];
|
||||
|
||||
#endif /* __ME_TABS_H__ */
|
||||
#endif /* ME_TABS_H_ */
|
||||
|
||||
|
|
|
|||
|
|
@ -60,8 +60,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#ifndef __MEMB_H__
|
||||
#define __MEMB_H__
|
||||
#ifndef MEMB_H_
|
||||
#define MEMB_H_
|
||||
|
||||
#include "sys/cc.h"
|
||||
|
||||
|
|
@ -134,4 +134,4 @@ int memb_inmemb(struct memb *m, void *ptr);
|
|||
/** @} */
|
||||
/** @} */
|
||||
|
||||
#endif /* __MEMB_H__ */
|
||||
#endif /* MEMB_H_ */
|
||||
|
|
|
|||
|
|
@ -56,8 +56,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#ifndef __MMEM_H__
|
||||
#define __MMEM_H__
|
||||
#ifndef MMEM_H_
|
||||
#define MMEM_H_
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
/**
|
||||
|
|
@ -87,7 +87,7 @@ int mmem_alloc(struct mmem *m, unsigned int size);
|
|||
void mmem_free(struct mmem *);
|
||||
void mmem_init(void);
|
||||
|
||||
#endif /* __MMEM_H__ */
|
||||
#endif /* MMEM_H_ */
|
||||
|
||||
/** @} */
|
||||
/** @} */
|
||||
|
|
|
|||
|
|
@ -46,8 +46,8 @@
|
|||
*
|
||||
*
|
||||
*/
|
||||
#ifndef __PETSCIICONV_H__
|
||||
#define __PETSCIICONV_H__
|
||||
#ifndef PETSCIICONV_H_
|
||||
#define PETSCIICONV_H_
|
||||
|
||||
#ifdef WITH_PETSCII
|
||||
|
||||
|
|
@ -75,4 +75,4 @@ void petsciiconv_topetscii(char *buf, unsigned int len);
|
|||
|
||||
#endif /* WITH_PETSCII */
|
||||
|
||||
#endif /* __PETSCIICONV_H__ */
|
||||
#endif /* PETSCIICONV_H_ */
|
||||
|
|
|
|||
|
|
@ -37,9 +37,9 @@
|
|||
* Adam Dunkels <adam@sics.se>
|
||||
*/
|
||||
|
||||
#ifndef __PRINT_STATS_H__
|
||||
#define __PRINT_STATS_H__
|
||||
#ifndef PRINT_STATS_H_
|
||||
#define PRINT_STATS_H_
|
||||
|
||||
void print_stats(void);
|
||||
|
||||
#endif /* __PRINT_STATS_H__ */
|
||||
#endif /* PRINT_STATS_H_ */
|
||||
|
|
|
|||
|
|
@ -29,8 +29,8 @@
|
|||
* This file is part of the Contiki operating system.
|
||||
*
|
||||
*/
|
||||
#ifndef __RANDOM_H__
|
||||
#define __RANDOM_H__
|
||||
#ifndef RANDOM_H_
|
||||
#define RANDOM_H_
|
||||
|
||||
/*
|
||||
* Initialize the pseudo-random generator.
|
||||
|
|
@ -49,4 +49,4 @@ unsigned short random_rand(void);
|
|||
/* Since random_rand casts to unsigned short, we'll use this maxmimum */
|
||||
#define RANDOM_RAND_MAX 65535U
|
||||
|
||||
#endif /* __RANDOM_H__ */
|
||||
#endif /* RANDOM_H_ */
|
||||
|
|
|
|||
|
|
@ -50,8 +50,8 @@
|
|||
* Adam Dunkels <adam@sics.se>
|
||||
*/
|
||||
|
||||
#ifndef __RINGBUF_H__
|
||||
#define __RINGBUF_H__
|
||||
#ifndef RINGBUF_H_
|
||||
#define RINGBUF_H_
|
||||
|
||||
#include "contiki-conf.h"
|
||||
|
||||
|
|
@ -128,4 +128,4 @@ int ringbuf_size(struct ringbuf *r);
|
|||
*/
|
||||
int ringbuf_elements(struct ringbuf *r);
|
||||
|
||||
#endif /* __RINGBUF_H__ */
|
||||
#endif /* RINGBUF_H_ */
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#ifndef __SENSORS_H__
|
||||
#define __SENSORS_H__
|
||||
#ifndef SENSORS_H_
|
||||
#define SENSORS_H_
|
||||
|
||||
#include "contiki.h"
|
||||
|
||||
|
|
@ -69,4 +69,4 @@ extern process_event_t sensors_event;
|
|||
|
||||
PROCESS_NAME(sensors_process);
|
||||
|
||||
#endif /* __SENSORS_H__ */
|
||||
#endif /* SENSORS_H_ */
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#ifndef __CONTIKI_SETTINGS_H__
|
||||
#define __CONTIKI_SETTINGS_H__
|
||||
#ifndef CONTIKI_SETTINGS_H_
|
||||
#define CONTIKI_SETTINGS_H_
|
||||
|
||||
/** @file settings.h
|
||||
* @brief Settings Manager
|
||||
|
|
@ -366,4 +366,4 @@ settings_set_uint64(settings_key_t key, uint64_t value)
|
|||
|
||||
#endif /* !SETTINGS_CONF_SKIP_CONVENIENCE_FUNCS */
|
||||
|
||||
#endif /* !defined(__CONTIKI_SETTINGS_H__) */
|
||||
#endif /* !defined(CONTIKI_SETTINGS_H_) */
|
||||
|
|
|
|||
|
|
@ -68,8 +68,8 @@
|
|||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
#ifndef __TRICKLE_TIMER_H__
|
||||
#define __TRICKLE_TIMER_H__
|
||||
#ifndef TRICKLE_TIMER_H_
|
||||
#define TRICKLE_TIMER_H_
|
||||
|
||||
#include "contiki-conf.h"
|
||||
#include "sys/ctimer.h"
|
||||
|
|
@ -509,6 +509,6 @@ void trickle_timer_inconsistency(struct trickle_timer *tt);
|
|||
|
||||
/** @} */
|
||||
|
||||
#endif /* __TRICKLE_TIMER_H__ */
|
||||
#endif /* TRICKLE_TIMER_H_ */
|
||||
/** @} */
|
||||
/** @} */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue