[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: pcb.git: branch: master updated (f6c2d4907583614a10918a121f45670620f1946e)
The branch, master has been updated
via f6c2d4907583614a10918a121f45670620f1946e (commit)
from e2c8f6f4878b68e4e0c1d4e15ffac00db12d968a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
src/action.h | 5 +++--
src/autoplace.h | 4 ++--
src/autoroute.h | 4 ++--
src/box.h | 4 ++--
src/buffer.h | 4 ++--
src/change.h | 4 ++--
src/clip.h | 4 ++--
src/command.h | 4 ++--
src/compat.h | 6 +++---
src/const.h | 4 ++--
src/copy.h | 4 ++--
src/create.h | 4 ++--
src/crosshair.h | 4 ++--
src/data.h | 4 ++--
src/dbus-pcbmain.h | 6 +++---
src/dbus.h | 6 +++---
src/djopt.h | 4 ++--
src/draw.h | 4 ++--
src/edif_parse.h | 6 +++---
src/error.h | 4 ++--
src/file.h | 4 ++--
src/find.h | 4 ++--
src/global.h | 14 +++++++-------
src/heap.h | 6 +++---
src/hid.h | 4 ++--
src/hid/common/actions.h | 4 ++--
src/hid/common/hid_resource.h | 4 ++--
src/hid/common/hidgl.h | 6 +++---
src/hid/common/hidinit.h | 4 ++--
src/hid/common/hidnogui.h | 4 ++--
src/hid/gcode/lists.h | 6 +++---
src/hid/gtk/gtkhid.h | 6 +++---
src/hid/gtk/gui-drc-window.h | 6 +++---
src/hid/gtk/gui-library-window.h | 6 +++---
src/hid/gtk/gui-pinout-preview.h | 6 +++---
src/hid/gtk/gui.h | 6 +++---
src/insert.h | 4 ++--
src/intersect.h | 4 ++--
src/line.h | 4 ++--
src/lrealpath.h | 6 +++---
src/macro.h | 4 ++--
src/mirror.h | 4 ++--
src/misc.h | 6 +++---
src/move.h | 4 ++--
src/mtspace.h | 8 +++++---
src/mymem.h | 4 ++--
src/parse_l.h | 4 ++--
src/pcb-printf.h | 4 ++--
src/polyarea.h | 6 +++---
src/polygon.h | 5 +++--
src/print.h | 4 ++--
src/rats.h | 5 +++--
src/remove.h | 4 ++--
src/report.h | 4 ++--
src/resource.h | 4 ++--
src/rotate.h | 4 ++--
src/rtree.h | 5 +++--
src/rubberband.h | 4 ++--
src/search.h | 4 ++--
src/select.h | 4 ++--
src/set.h | 4 ++--
src/strflags.h | 4 ++--
src/thermal.h | 4 ++--
src/toporouter.h | 6 +++---
src/undo.h | 4 ++--
src/vector.h | 6 +++---
src/vendor.h | 4 ++--
67 files changed, 163 insertions(+), 157 deletions(-)
=================
Commit Messages
=================
commit f6c2d4907583614a10918a121f45670620f1946e
Author: DJ Delorie <dj@xxxxxxxxxxx>
Commit: DJ Delorie <dj@xxxxxxxxxxx>
Fix header guard macro names
Closes-bug: lp-699161
Make all headers use standard-compliant guard macro names.
:100644 100644 e92c578... 83089f3... M src/action.h
:100644 100644 ffb15df... 5133cf0... M src/autoplace.h
:100644 100644 59f75ad... d659349... M src/autoroute.h
:100644 100644 bedb6ab... 3dc779e... M src/box.h
:100644 100644 98da959... 7182a9d... M src/buffer.h
:100644 100644 7bae706... 94a0e21... M src/change.h
:100644 100644 fcc5f2e... c06d64f... M src/clip.h
:100644 100644 2bc057c... 5517993... M src/command.h
:100644 100644 7f0b080... 9afa02c... M src/compat.h
:100644 100644 724b3be... 1575b09... M src/const.h
:100644 100644 ac50e2c... bd2ea80... M src/copy.h
:100644 100644 521f60e... 754a450... M src/create.h
:100644 100644 6e9656e... 15b3470... M src/crosshair.h
:100644 100644 bf8e421... 502acdd... M src/data.h
:100644 100644 2caa006... 118f4e3... M src/dbus-pcbmain.h
:100644 100644 3d4177e... 1babb17... M src/dbus.h
:100644 100644 03de80a... 76ee3b6... M src/djopt.h
:100644 100644 adfee36... bda02f8... M src/draw.h
:100644 100644 a39e57b... 7def326... M src/edif_parse.h
:100644 100644 8363d48... 8409767... M src/error.h
:100644 100644 a2f7859... 6cf7a99... M src/file.h
:100644 100644 892c7ef... 9560bd9... M src/find.h
:100644 100644 94f4fae... 3210d5f... M src/global.h
:100644 100644 6ee973d... 381c7b2... M src/heap.h
:100644 100644 eeb09ab... b2725ac... M src/hid.h
:100644 100644 1cc6f24... f5743f2... M src/hid/common/actions.h
:100644 100644 ab382fc... d011b31... M src/hid/common/hid_resource.h
:100644 100644 37d35b9... 3af338d... M src/hid/common/hidgl.h
:100644 100644 bd1174f... 1744189... M src/hid/common/hidinit.h
:100644 100644 244c8c2... 518ff06... M src/hid/common/hidnogui.h
:100644 100644 2a2353f... 3513184... M src/hid/gcode/lists.h
:100644 100644 b3e7ca1... f55845b... M src/hid/gtk/gtkhid.h
:100644 100644 f48a944... 9bd26cf... M src/hid/gtk/gui-drc-window.h
:100644 100644 4be1cf4... 5ff6a7b... M src/hid/gtk/gui-library-window.h
:100644 100644 0e12c54... 978bb25... M src/hid/gtk/gui-pinout-preview.h
:100644 100644 c52fb65... c4da30f... M src/hid/gtk/gui.h
:100644 100644 350a0de... 51c75e4... M src/insert.h
:100644 100644 de626e8... 2c1e7f5... M src/intersect.h
:100644 100644 1a651fb... a59f1bb... M src/line.h
:100644 100644 a4f7081... dba14ac... M src/lrealpath.h
:100644 100644 695d3b6... 025351f... M src/macro.h
:100644 100644 589391b... 94d17c1... M src/mirror.h
:100644 100644 7926460... f904e19... M src/misc.h
:100644 100644 0547686... 2b41bce... M src/move.h
:100644 100644 4bbbbbf... b2872cd... M src/mtspace.h
:100644 100644 6b572d8... cbfd47e... M src/mymem.h
:100644 100644 f0b20ff... eb01528... M src/parse_l.h
:100644 100644 bcf319e... 31346f4... M src/pcb-printf.h
:100644 100644 ce427ad... 413f519... M src/polyarea.h
:100644 100644 315e69b... e3b31c0... M src/polygon.h
:100644 100644 cf8689f... 2215aea... M src/print.h
:100644 100644 3d70f27... 9479fe0... M src/rats.h
:100644 100644 9fd4625... 1fc8890... M src/remove.h
:100644 100644 7abbb79... 6d0184e... M src/report.h
:100644 100644 5a11601... 614aace... M src/resource.h
:100644 100644 f032fcb... c9c78b8... M src/rotate.h
:100644 100644 862bbe9... cb23307... M src/rtree.h
:100644 100644 3698786... 9e671bf... M src/rubberband.h
:100644 100644 add5661... b6ddaa2... M src/search.h
:100644 100644 0e12cc2... f3edde6... M src/select.h
:100644 100644 f8f6a9a... 4985f9d... M src/set.h
:100644 100644 241ba1b... da16b64... M src/strflags.h
:100644 100644 a2958d1... 67c04e0... M src/thermal.h
:100644 100644 0e98115... fcd0053... M src/toporouter.h
:100644 100644 0a4601f... 9b088ff... M src/undo.h
:100644 100644 3eabef5... 344118d... M src/vector.h
:100644 100644 3b4d2d4... aba4148... M src/vendor.h
=========
Changes
=========
commit f6c2d4907583614a10918a121f45670620f1946e
Author: DJ Delorie <dj@xxxxxxxxxxx>
Commit: DJ Delorie <dj@xxxxxxxxxxx>
Fix header guard macro names
Closes-bug: lp-699161
Make all headers use standard-compliant guard macro names.
diff --git a/src/action.h b/src/action.h
index e92c578..83089f3 100644
--- a/src/action.h
+++ b/src/action.h
@@ -28,8 +28,8 @@
/* prototypes for action routines
*/
-#ifndef __ACTION_INCLUDED__
-#define __ACTION_INCLUDED__
+#ifndef PCB_ACTION_H
+#define PCH_ACTION_H
#include "global.h"
@@ -45,4 +45,5 @@ void warpNoWhere (void);
/* In gui-misc.c */
bool ActionGetLocation (char *);
void ActionGetXY (char *);
+
#endif
diff --git a/src/autoplace.h b/src/autoplace.h
index ffb15df..5133cf0 100644
--- a/src/autoplace.h
+++ b/src/autoplace.h
@@ -35,8 +35,8 @@
/* prototypes for autoplace routines
*/
-#ifndef __AUTOPLACE_INCLUDED__
-#define __AUTOPLACE_INCLUDED__
+#ifndef PCB_AUTOPLACE_H
+#define PCB_AUTOPLACE_H
#include "global.h"
diff --git a/src/autoroute.h b/src/autoroute.h
index 59f75ad..d659349 100644
--- a/src/autoroute.h
+++ b/src/autoroute.h
@@ -34,8 +34,8 @@
/* prototypes for autoroute routines
*/
-#ifndef __AUTOROUTE_INCLUDED__
-#define __AUTOROUTE_INCLUDED__
+#ifndef PCB_AUTOROUTE_H
+#define PCB_AUTOROUTE_H
#include "global.h"
diff --git a/src/box.h b/src/box.h
index bedb6ab..3dc779e 100644
--- a/src/box.h
+++ b/src/box.h
@@ -34,8 +34,8 @@
/* random box-related utilities.
*/
-#ifndef __BOX_H_INCLUDED__
-#define __BOX_H_INCLUDED__
+#ifndef PCB_BOX_H
+#define PCB_BOX_H
#include <assert.h>
#include "global.h"
diff --git a/src/buffer.h b/src/buffer.h
index 98da959..7182a9d 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -28,8 +28,8 @@
/* prototypes for buffer handling routines
*/
-#ifndef __BUFFER_INCLUDED__
-#define __BUFFER_INCLUDED__
+#ifndef PCB_BUFFER_H
+#define PCB_BUFFER_H
#include "global.h"
diff --git a/src/change.h b/src/change.h
index 7bae706..94a0e21 100644
--- a/src/change.h
+++ b/src/change.h
@@ -28,8 +28,8 @@
/* prototypes to change object properties
*/
-#ifndef __CHANGE_INCLUDED__
-#define __CHANGE_INCLUDED__
+#ifndef PCB_CHANGE_H
+#define PCB_CHANGE_H
#include "global.h"
diff --git a/src/clip.h b/src/clip.h
index fcc5f2e..c06d64f 100644
--- a/src/clip.h
+++ b/src/clip.h
@@ -29,8 +29,8 @@
/* prototypes for inserting points into objects
*/
-#ifndef __CLIP_INCLUDED__
-#define __CLIP_INCLUDED__
+#ifndef PCB_CLIP_H
+#define PCB_CLIP_H
#include "global.h"
diff --git a/src/command.h b/src/command.h
index 2bc057c..5517993 100644
--- a/src/command.h
+++ b/src/command.h
@@ -28,8 +28,8 @@
/* prototypes for command execution
*/
-#ifndef __COMMAND_INCLUDED__
-#define __COMMAND_INCLUDED__
+#ifndef PCB_COMMAND_H
+#define PCB_COMMAND_H
#include "global.h"
diff --git a/src/compat.h b/src/compat.h
index 7f0b080..9afa02c 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -22,8 +22,8 @@
*
*/
-#ifndef __COMPAT_H__
-#define __COMPAT_H__
+#ifndef PCB_COMPAT_H
+#define PCH_COMPAT_H
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -57,5 +57,5 @@ void * dlsym(void *, const char *);
#endif
-#endif /* __COMPAT_H__ */
+#endif /* PCB_COMPAT_H */
diff --git a/src/const.h b/src/const.h
index 724b3be..1575b09 100644
--- a/src/const.h
+++ b/src/const.h
@@ -28,8 +28,8 @@
/* global source constants
*/
-#ifndef __CONST_INCLUDED__
-#define __CONST_INCLUDED__
+#ifndef PCB_CONST_H
+#define PCB_CONST_H
#include <limits.h>
#include <math.h>
diff --git a/src/copy.h b/src/copy.h
index ac50e2c..bd2ea80 100644
--- a/src/copy.h
+++ b/src/copy.h
@@ -28,8 +28,8 @@
/* prototypes for copy routines
*/
-#ifndef __COPY_INCLUDED__
-#define __COPY_INCLUDED__
+#ifndef PCB_COPY_H
+#define PCB_COPY_H
#include "global.h"
diff --git a/src/create.h b/src/create.h
index 521f60e..754a450 100644
--- a/src/create.h
+++ b/src/create.h
@@ -28,8 +28,8 @@
/* prototypes for create routines
*/
-#ifndef __CREATE_INCLUDED__
-#define __CREATE_INCLUDED__
+#ifndef PCB_CREATE_H
+#define PCB_CREATE_H
#include "global.h"
diff --git a/src/crosshair.h b/src/crosshair.h
index 6e9656e..15b3470 100644
--- a/src/crosshair.h
+++ b/src/crosshair.h
@@ -28,8 +28,8 @@
/* prototypes for crosshair routines
*/
-#ifndef __CROSSHAIR_INCLUDED__
-#define __CROSSHAIR_INCLUDED__
+#ifndef PCB_CROSSHAIR_H
+#define PCB_CROSSHAIR_H
#include "global.h"
diff --git a/src/data.h b/src/data.h
index bf8e421..502acdd 100644
--- a/src/data.h
+++ b/src/data.h
@@ -28,8 +28,8 @@
/* common identifiers
*/
-#ifndef __DATA_INCLUDED__
-#define __DATA_INCLUDED__
+#ifndef PCB_DATA_H
+#define PCB_DATA_H
#include "global.h"
diff --git a/src/dbus-pcbmain.h b/src/dbus-pcbmain.h
index 2caa006..118f4e3 100644
--- a/src/dbus-pcbmain.h
+++ b/src/dbus-pcbmain.h
@@ -17,8 +17,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _DBUS_PCBMAIN_H_
-#define _DBUS_PCBMAIN_H_
+#ifndef PCB_DBUS_PCBMAIN_H
+#define PCB_DBUS_PCBMAIN_H
#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus.h>
@@ -26,4 +26,4 @@
void pcb_dbus_connection_setup_with_mainloop (DBusConnection * connection);
void pcb_dbus_connection_finish_with_mainloop (DBusConnection * connection);
-#endif /* !_DBUS_PCBMAIN_H */
+#endif /* !PCB_DBUS_PCBMAIN_H */
diff --git a/src/dbus.h b/src/dbus.h
index 3d4177e..1babb17 100644
--- a/src/dbus.h
+++ b/src/dbus.h
@@ -17,8 +17,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _DBUS_H_
-#define _DBUS_H_
+#ifndef PCB_DBUS_H
+#define PCB_DBUS_H
/* Carry out all actions to setup the D-Bus and register appropriate callbacks */
void pcb_dbus_setup ();
@@ -27,4 +27,4 @@ void pcb_dbus_setup ();
void pcb_dbus_finish ();
-#endif /* !_DBUS_H */
+#endif /* !PCB_DBUS_H */
diff --git a/src/djopt.h b/src/djopt.h
index 03de80a..76ee3b6 100644
--- a/src/djopt.h
+++ b/src/djopt.h
@@ -26,8 +26,8 @@
*
*/
-#ifndef __DJOPT_INCLUDED__
-#define __DJOPT_INCLUDED__
+#ifndef PCB_DJOPT_H
+#define PCB_DJOPT_H
#include "global.h"
diff --git a/src/draw.h b/src/draw.h
index adfee36..bda02f8 100644
--- a/src/draw.h
+++ b/src/draw.h
@@ -28,8 +28,8 @@
/* prototypes for drawing routines
*/
-#ifndef __DRAW_INCLUDED__
-#define __DRAW_INCLUDED__
+#ifndef PCB_DRAW_H
+#define PCB_DRAW_H
#include "global.h"
diff --git a/src/edif_parse.h b/src/edif_parse.h
index a39e57b..7def326 100644
--- a/src/edif_parse.h
+++ b/src/edif_parse.h
@@ -20,11 +20,11 @@
*/
-#ifndef __EDIF_PARSE_H__
-#define __EDIF_PARSE_H__
+#ifndef PCB_EDIF_PARSE_H
+#define PCB_EDIF_PARSE_H
void ParseEDIF(char* filename,FILE* err);
-#endif /* __EDIF_PARSE_H__ */
+#endif /* PCB_EDIF_PARSE_H */
diff --git a/src/error.h b/src/error.h
index 8363d48..8409767 100644
--- a/src/error.h
+++ b/src/error.h
@@ -28,8 +28,8 @@
/* prototypes for error and debug functions
*/
-#ifndef __ERROR_INCLUDED__
-#define __ERROR_INCLUDED__
+#ifndef PCB_ERROR_H
+#define PCB_ERROR_H
#define STATUS_OK 0
diff --git a/src/file.h b/src/file.h
index a2f7859..6cf7a99 100644
--- a/src/file.h
+++ b/src/file.h
@@ -27,8 +27,8 @@
/* prototypes for file routines
*/
-#ifndef __FILE_INCLUDED__
-#define __FILE_INCLUDED__
+#ifndef PCB_FILE_H
+#define PCB_FILE_H
#include <stdio.h> /* needed to define 'FILE *' */
#include "global.h"
diff --git a/src/find.h b/src/find.h
index 892c7ef..9560bd9 100644
--- a/src/find.h
+++ b/src/find.h
@@ -28,8 +28,8 @@
/* prototypes connection search routines
*/
-#ifndef __FIND_INCLUDED__
-#define __FIND_INCLUDED__
+#ifndef PCB_FIND_H
+#define PCB_FIND_H
#include <stdio.h> /* needed to define 'FILE *' */
#include "global.h"
diff --git a/src/global.h b/src/global.h
index 94f4fae..3210d5f 100644
--- a/src/global.h
+++ b/src/global.h
@@ -35,8 +35,8 @@
* silkscreen layer. Perhaps the design is not the best.
*/
-#ifndef __GLOBAL_INCLUDED__
-#define __GLOBAL_INCLUDED__
+#ifndef PCB_GLOBAL_H
+#define PCB_GLOBAL_H
#include "const.h"
#include "macro.h"
@@ -135,11 +135,11 @@ typedef struct
* the compiler about the expected result of an expression. Some compilers
* can use this information for optimizations.
*
- * The _BOOLEAN_EXPR macro is intended to trigger a gcc warning when
+ * The PCB_BOOLEAN_EXPR macro is intended to trigger a gcc warning when
* putting assignments inside the test.
*/
#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
-#define _BOOLEAN_EXPR(expr) \
+#define PCB_BOOLEAN_EXPR(expr) \
__extension__ ({ \
int _boolean_var_; \
if (expr) \
@@ -148,8 +148,8 @@ typedef struct
_boolean_var_ = 0; \
_boolean_var_; \
})
-#define LIKELY(expr) (__builtin_expect (_BOOLEAN_EXPR(expr), 1))
-#define UNLIKELY(expr) (__builtin_expect (_BOOLEAN_EXPR(expr), 0))
+#define LIKELY(expr) (__builtin_expect (PCB_BOOLEAN_EXPR(expr), 1))
+#define UNLIKELY(expr) (__builtin_expect (PCB_BOOLEAN_EXPR(expr), 0))
#else
#define LIKELY(expr) (expr)
#define UNLIKELY(expr) (expr)
@@ -840,4 +840,4 @@ extern char *pcbtreepath; /* The search path for newlib fps */
extern char *exec_prefix;
extern char *homedir;
-#endif /* __GLOBAL_INCLUDED__ */
+#endif /* PCB_GLOBAL_H */
diff --git a/src/heap.h b/src/heap.h
index 6ee973d..381c7b2 100644
--- a/src/heap.h
+++ b/src/heap.h
@@ -34,8 +34,8 @@
/* prototypes for heap routines.
*/
-#ifndef __HEAP_INCLUDED__
-#define __HEAP_INCLUDED__
+#ifndef PCB_HEAP_H
+#define PCB_HEAP_H
#include "global.h"
@@ -62,4 +62,4 @@ void *heap_replace (heap_t * heap, cost_t cost, void *data);
int heap_is_empty (heap_t * heap);
int heap_size (heap_t * heap);
-#endif /* __HEAP_INCLUDED__ */
+#endif /* PCB_HEAP_H */
diff --git a/src/hid.h b/src/hid.h
index eeb09ab..b2725ac 100644
--- a/src/hid.h
+++ b/src/hid.h
@@ -1,5 +1,5 @@
-#ifndef _HID_H_
-#define _HID_H_
+#ifndef PCB_HID_H
+#define PCB_HID_H
#include <stdarg.h>
diff --git a/src/hid/common/actions.h b/src/hid/common/actions.h
index 1cc6f24..f5743f2 100644
--- a/src/hid/common/actions.h
+++ b/src/hid/common/actions.h
@@ -1,6 +1,6 @@
-#ifndef __HID_ACTIONS_INCLUDED__
-#define __HID_ACTIONS_INCLUDED__
+#ifndef PCB_HID_COMMON_ACTIONS_H
+#define PCB_HID_COMMON_ACTIONS_H
void print_actions (void);
diff --git a/src/hid/common/hid_resource.h b/src/hid/common/hid_resource.h
index ab382fc..d011b31 100644
--- a/src/hid/common/hid_resource.h
+++ b/src/hid/common/hid_resource.h
@@ -1,6 +1,6 @@
-#ifndef __HID_RESOURCE_INCLUDED__
-#define __HID_RESOURCE_INCLUDED__
+#ifndef PCB_HID_COMMON_HID_RESOURCE_H
+#define PCH_HID_COMMON_HID_RESOURCE_H
#include "resource.h"
diff --git a/src/hid/common/hidgl.h b/src/hid/common/hidgl.h
index 37d35b9..3af338d 100644
--- a/src/hid/common/hidgl.h
+++ b/src/hid/common/hidgl.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef __HIDGL_INCLUDED__
-#define __HIDGL_INCLUDED__
+#ifndef PCB_HID_COMMON_HIDGL_H
+#define PCB_HID_COMMON_HIDGL_H
#define TRIANGLE_ARRAY_SIZE 5461
typedef struct {
@@ -82,4 +82,4 @@ int hidgl_assign_clear_stencil_bit (void);
void hidgl_return_stencil_bit (int bit);
void hidgl_reset_stencil_usage (void);
-#endif /* __HIDGL_INCLUDED__ */
+#endif /* PCB_HID_COMMON_HIDGL_H */
diff --git a/src/hid/common/hidinit.h b/src/hid/common/hidinit.h
index bd1174f..1744189 100644
--- a/src/hid/common/hidinit.h
+++ b/src/hid/common/hidinit.h
@@ -1,5 +1,5 @@
-#ifndef __HID_INIT_INCLUDED__
-#define __HID_INIT_INCLUDED__
+#ifndef PCB_HID_COMMON_HIDINIT_H
+#define PCB_HID_COMMON_HIDINIT_H
void hid_parse_command_line (int *argc, char ***argv);
diff --git a/src/hid/common/hidnogui.h b/src/hid/common/hidnogui.h
index 244c8c2..518ff06 100644
--- a/src/hid/common/hidnogui.h
+++ b/src/hid/common/hidnogui.h
@@ -1,5 +1,5 @@
-#ifndef __HID_NOGUI_INCLUDED__
-#define __HID_NOGUI_INCLUDED__
+#ifndef PCB_HID_COMMON_HIDNOGUI_H
+#define PCB_HID_COMMON_HIDNOGUI_H
void common_nogui_init (HID *hid);
HID *hid_nogui_get_hid (void);
diff --git a/src/hid/gcode/lists.h b/src/hid/gcode/lists.h
index 2a2353f..3513184 100644
--- a/src/hid/gcode/lists.h
+++ b/src/hid/gcode/lists.h
@@ -4,8 +4,8 @@
/* $Id: lists.h 147 2007-04-09 00:44:09Z selinger $ */
-#ifndef _PS_LISTS_H
-#define _PS_LISTS_H
+#ifndef PCB_HID_GCODE_LISTS_H
+#define PCB_HID_GCODE_LISTS_H
/* here we define some general list macros. Because they are macros,
they should work on any datatype with a "->next" component. Some of
@@ -282,4 +282,4 @@
} \
MACRO_END
-#endif /* _PS_LISTS_H */
+#endif /* PCB_HID_GCODE_LISTS_H */
diff --git a/src/hid/gtk/gtkhid.h b/src/hid/gtk/gtkhid.h
index b3e7ca1..f55845b 100644
--- a/src/hid/gtk/gtkhid.h
+++ b/src/hid/gtk/gtkhid.h
@@ -1,8 +1,8 @@
/* $Id$ */
-#ifndef __GTKHID_H__
-#define __GTKHID_H__
+#ifndef PCB_HID_GTK_GTKHID_H
+#define PCB_HID_GTK_GTKHID_H
void ghid_notify_gui_is_up(void);
-#endif /* __GTKHID_H__ */
+#endif /* PCB_HID_GTK_GTKHID_H */
diff --git a/src/hid/gtk/gui-drc-window.h b/src/hid/gtk/gui-drc-window.h
index f48a944..9bd26cf 100644
--- a/src/hid/gtk/gui-drc-window.h
+++ b/src/hid/gtk/gui-drc-window.h
@@ -26,8 +26,8 @@
*
*/
-#ifndef __GUI_DRC_WINDOW_H__
-#define __GUI_DRC_WINDOW_H__
+#ifndef PCB_HID_GTK_GUI_DRC_WINDOW_H
+#define PCB_HID_GTK_GUI_DRC_WINDOW_H
#define GHID_TYPE_DRC_VIOLATION (ghid_drc_violation_get_type())
@@ -99,4 +99,4 @@ GType ghid_violation_renderer_get_type (void);
GtkCellRenderer *ghid_violation_renderer_new (void);
-#endif /* __GUI_DRC_WINDOW_H__ */
+#endif /* PCB_HID_GTK_GUI_DRC_WINDOW_H */
diff --git a/src/hid/gtk/gui-library-window.h b/src/hid/gtk/gui-library-window.h
index 4be1cf4..5ff6a7b 100644
--- a/src/hid/gtk/gui-library-window.h
+++ b/src/hid/gtk/gui-library-window.h
@@ -18,8 +18,8 @@
*/
-#ifndef __GUI_LIBRARY_WINDOW_H__
-#define __GUI_LIBRARY_WINDOW_H__
+#ifndef PCB_HID_GTK_GUI_LIBRARY_WINDOW_H
+#define PCB_HID_GTK_GUI_LIBRARY_WINDOW_H
/*
@@ -57,4 +57,4 @@ struct _GhidLibraryWindow
GType ghid_library_window_get_type (void);
-#endif /* __GUI_LIBRARY_WINDOW_H__ */
+#endif /* PCB_HID_GTK_GUI_LIBRARY_WINDOW_H */
diff --git a/src/hid/gtk/gui-pinout-preview.h b/src/hid/gtk/gui-pinout-preview.h
index 0e12c54..978bb25 100644
--- a/src/hid/gtk/gui-pinout-preview.h
+++ b/src/hid/gtk/gui-pinout-preview.h
@@ -28,8 +28,8 @@
/* This file written by Peter Clifton */
-#ifndef __GHID_PINOUT_PREVIEW_H__
-#define __GHID_PINOUT_PREVIEW_H__
+#ifndef PCB_HID_GTK_GUI_PINOUT_PREVIEW_H
+#define PCB_HID_GTK_GUI_PINOUT_PREVIEW_H
#define GHID_TYPE_PINOUT_PREVIEW (ghid_pinout_preview_get_type())
@@ -65,4 +65,4 @@ GtkWidget *ghid_pinout_preview_new (ElementType * element);
void ghid_pinout_preview_get_natural_size (GhidPinoutPreview * pinout,
int *width, int *height);
-#endif /* __GHID_PINOUT_PREVIEW_H__ */
+#endif /* PCB_HID_GTK_GUI_PINOUT_PREVIEW_H */
diff --git a/src/hid/gtk/gui.h b/src/hid/gtk/gui.h
index c52fb65..c4da30f 100644
--- a/src/hid/gtk/gui.h
+++ b/src/hid/gtk/gui.h
@@ -24,8 +24,8 @@
/* FIXME - rename this file to ghid.h */
-#ifndef __GHID_INCLUDED__
-#define __GHID_INCLUDED__
+#ifndef PCB_HID_GTK_GHID_H
+#define PCB_HID_GTK_GHID_H
#include "global.h"
#include "hid.h"
@@ -576,4 +576,4 @@ Pz (int z)
return (z * gport->zoom);
}
-#endif /* __GHID_INCLUDED__ */
+#endif /* PCB_HID_GTK_GHID_H */
diff --git a/src/insert.h b/src/insert.h
index 350a0de..51c75e4 100644
--- a/src/insert.h
+++ b/src/insert.h
@@ -28,8 +28,8 @@
/* prototypes for inserting points into objects
*/
-#ifndef __INSERT_INCLUDED__
-#define __INSERT_INCLUDED__
+#ifndef PCB_INSERT_H
+#define PCB_INSERT_H
#include "global.h"
diff --git a/src/intersect.h b/src/intersect.h
index de626e8..2c1e7f5 100644
--- a/src/intersect.h
+++ b/src/intersect.h
@@ -34,8 +34,8 @@
/* prototypes for rectangle intersection/union routines.
*/
-#ifndef __INTERSECT_INCLUDED__
-#define __INTERSECT_INCLUDED__
+#ifndef PCB_INTERSECT_H
+#define PCB_INTERSECT_H
#include "global.h"
diff --git a/src/line.h b/src/line.h
index 1a651fb..a59f1bb 100644
--- a/src/line.h
+++ b/src/line.h
@@ -29,8 +29,8 @@
/* prototypes for inserting points into objects
*/
-#ifndef __LINE_INCLUDED__
-#define __LINE_INCLUDED__
+#ifndef PCB_LINE_H
+#define PCB_LINE_H
#include "global.h"
diff --git a/src/lrealpath.h b/src/lrealpath.h
index a4f7081..dba14ac 100644
--- a/src/lrealpath.h
+++ b/src/lrealpath.h
@@ -1,9 +1,9 @@
-#ifndef __LREALPATH_H__
-#define __LREALPATH_H__
+#ifndef PCB_LREALPATH_H
+#define PCH_LREALPATH_H
/* A well-defined realpath () that is always compiled in. */
char *lrealpath (const char *);
-#endif /* __LREALPATH_H__ */
+#endif /* PCB_LREALPATH_H */
diff --git a/src/macro.h b/src/macro.h
index 695d3b6..025351f 100644
--- a/src/macro.h
+++ b/src/macro.h
@@ -29,8 +29,8 @@
* the file is included by global.h after const.h
*/
-#ifndef __MACRO_INCLUDED__
-#define __MACRO_INCLUDED__
+#ifndef PCB_MACRO_H
+#define PCB_MACRO_H
/* ---------------------------------------------------------------------------
* macros to transform coord systems
diff --git a/src/mirror.h b/src/mirror.h
index 589391b..94d17c1 100644
--- a/src/mirror.h
+++ b/src/mirror.h
@@ -28,8 +28,8 @@
/* prototypes to change objects mirror flag
*/
-#ifndef __MIRROR_INCLUDED__
-#define __MIRROR_INCLUDED__
+#ifndef PCB_MIRROR_H
+#define PCB_MIRROR_H
#include "global.h"
diff --git a/src/misc.h b/src/misc.h
index 7926460..f904e19 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -28,8 +28,8 @@
/* prototypes for misc routines
*/
-#ifndef __MISC_INCLUDED__
-#define __MISC_INCLUDED__
+#ifndef PCB_MISC_H
+#define PCB_MISC_H
#include <stdlib.h>
#include "global.h"
@@ -167,5 +167,5 @@ void NetlistChanged (int force_unfreeze);
#endif
-#endif /* __MISC_INCLUDED__ */
+#endif /* PCB_MISC_H */
diff --git a/src/move.h b/src/move.h
index 0547686..2b41bce 100644
--- a/src/move.h
+++ b/src/move.h
@@ -28,8 +28,8 @@
/* prototypes for move routines
*/
-#ifndef __MOVE_INCLUDED__
-#define __MOVE_INCLUDED__
+#ifndef PCB_MOVE_H
+#define PCB_MOVE_H
#include "global.h"
diff --git a/src/mtspace.h b/src/mtspace.h
index 4bbbbbf..b2872cd 100644
--- a/src/mtspace.h
+++ b/src/mtspace.h
@@ -35,8 +35,9 @@
* in the auto-router.
*/
-#ifndef __MTSPACE_INCLUDED__
-#define __MTSPACE_INCLUDED__
+#ifndef PCB_MTSPACE_H
+#define PCB_MTSPACE_H
+
/* mtspace data structures are built on r-trees. */
#include "global.h"
@@ -81,4 +82,5 @@ vetting_t *mtspace_query_rect (mtspace_t * mtspace, const BoxType * region,
void mtsFreeWork (vetting_t **);
int mtsBoxCount (vetting_t *);
-#endif /* ! __MTSPACE_INCLUDED__ */
+
+#endif /* ! PCB_MTSPACE_H */
diff --git a/src/mymem.h b/src/mymem.h
index 6b572d8..cbfd47e 100644
--- a/src/mymem.h
+++ b/src/mymem.h
@@ -28,8 +28,8 @@
/* prototypes for memory routines
*/
-#ifndef __MYMEM_INCLUDED__
-#define __MYMEM_INCLUDED__
+#ifndef PCB_MYMEM_H
+#define PCB_MYMEM_H
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/src/parse_l.h b/src/parse_l.h
index f0b20ff..eb01528 100644
--- a/src/parse_l.h
+++ b/src/parse_l.h
@@ -28,8 +28,8 @@
/* just defines common parser identifiers
*/
-#ifndef __LEX_INCLUDED__
-#define __LEX_INCLUDED__
+#ifndef PCB_LEX_H
+#define PCB_LEX_H
#include "global.h"
diff --git a/src/pcb-printf.h b/src/pcb-printf.h
index bcf319e..31346f4 100644
--- a/src/pcb-printf.h
+++ b/src/pcb-printf.h
@@ -63,8 +63,8 @@
* No support for %zu size_t printf spec
*/
-#ifndef __PCB_PRINTF_INCLUDED__
-#define __PCB_PRINTF_INCLUDED__
+#ifndef PCB_PCB_PRINTF_H
+#define PCB_PCB_PRINTF_H
enum e_allow {
ALLOW_NM = 1,
diff --git a/src/polyarea.h b/src/polyarea.h
index ce427ad..413f519 100644
--- a/src/polyarea.h
+++ b/src/polyarea.h
@@ -22,8 +22,8 @@
(C) 1997 Klamer Schutte (minor patches)
*/
-#ifndef _POLYBOOL_H
-#define _POLYBOOL_H
+#ifndef PCB_POLYAREA_H
+#define PCB_POLYAREA_H
#ifdef __cplusplus
extern "C" {
@@ -188,4 +188,4 @@ int SavePOLYAREA( POLYAREA *PA, char * fname);
}
#endif
-#endif /* POLY_H */
+#endif /* PCB_POLYAREA_H */
diff --git a/src/polygon.h b/src/polygon.h
index 315e69b..e3b31c0 100644
--- a/src/polygon.h
+++ b/src/polygon.h
@@ -28,8 +28,8 @@
/* prototypes for polygon editing routines
*/
-#ifndef __POLYGON_INCLUDED__
-#define __POLYGON_INCLUDED__
+#ifndef PCB_POLYGON_H
+#define PCH_POLYGON_H
#include "global.h"
@@ -89,4 +89,5 @@ bool MorphPolygon (LayerTypePtr, PolygonTypePtr);
void NoHolesPolygonDicer (PolygonType *p, const BoxType *clip,
void (*emit) (PLINE *, void *), void *user_data);
void PolyToPolygonsOnLayer (DataType *, LayerType *, POLYAREA *, FlagType);
+
#endif
diff --git a/src/print.h b/src/print.h
index cf8689f..2215aea 100644
--- a/src/print.h
+++ b/src/print.h
@@ -28,8 +28,8 @@
/* prototypes for printing routines
*/
-#ifndef __PRINT_INCLUDED__
-#define __PRINT_INCLUDED__
+#ifndef PCB_PRINT_H
+#define PCB_PRINT_H
#include <stdio.h>
diff --git a/src/rats.h b/src/rats.h
index 3d70f27..9479fe0 100644
--- a/src/rats.h
+++ b/src/rats.h
@@ -30,8 +30,8 @@
/* prototypes for rats routines
*/
-#ifndef __RATS_INCLUDED__
-#define __RATS_INCLUDED__
+#ifndef PCB_RATS_H
+#define PCB_RATS_H
#include "global.h"
@@ -47,4 +47,5 @@ bool SeekPad (LibraryEntryTypePtr, ConnectionTypePtr, bool);
NetListTypePtr ProcNetlist (LibraryTypePtr);
NetListListType CollectSubnets (bool);
+
#endif
diff --git a/src/remove.h b/src/remove.h
index 9fd4625..1fc8890 100644
--- a/src/remove.h
+++ b/src/remove.h
@@ -28,8 +28,8 @@
/* prototypes for remove routines
*/
-#ifndef __REMOVE_INCLUDED__
-#define __REMOVE_INCLUDED__
+#ifndef PCB_REMOVE_H
+#define PCB_REMOVE_H
#include "global.h"
diff --git a/src/report.h b/src/report.h
index 7abbb79..6d0184e 100644
--- a/src/report.h
+++ b/src/report.h
@@ -25,8 +25,8 @@
* RCS: $Id$
*/
-#ifndef __REPORT_INCLUDED__
-#define __REPORT_INCLUDED__
+#ifndef PCB_REPORT_H
+#define PCB_REPORT_H
#include "global.h"
diff --git a/src/resource.h b/src/resource.h
index 5a11601..614aace 100644
--- a/src/resource.h
+++ b/src/resource.h
@@ -1,7 +1,7 @@
/* $Id$ */
-#ifndef __RESOURCE_INCLUDED__
-#define __RESOURCE_INCLUDED__ 1
+#ifndef PCB_RESOURCE_H
+#define PCB_RESOURCE_H
#include <stdio.h>
diff --git a/src/rotate.h b/src/rotate.h
index f032fcb..c9c78b8 100644
--- a/src/rotate.h
+++ b/src/rotate.h
@@ -28,8 +28,8 @@
/* prototypes for transform routines
*/
-#ifndef __ROTATE_INCLUDED__
-#define __ROTATE_INCLUDED__
+#ifndef PCB_ROTATE_H
+#define PCB_ROTATE_H
#include "global.h"
diff --git a/src/rtree.h b/src/rtree.h
index 862bbe9..cb23307 100644
--- a/src/rtree.h
+++ b/src/rtree.h
@@ -34,8 +34,8 @@
/* prototypes for r-tree routines.
*/
-#ifndef __RTREE_INCLUDED__
-#define __RTREE_INCLUDED__
+#ifndef PCB_RTREE_H
+#define PCB_RTREE_H
#include "global.h"
@@ -89,4 +89,5 @@ static inline int r_search_pt (rtree_t * rtree, const PointType * pt,
int r_region_is_empty (rtree_t * rtree, const BoxType * region);
void __r_dump_tree (struct rtree_node *, int);
+
#endif
diff --git a/src/rubberband.h b/src/rubberband.h
index 3698786..9e671bf 100644
--- a/src/rubberband.h
+++ b/src/rubberband.h
@@ -28,8 +28,8 @@
/* prototypes for rubberband routines
*/
-#ifndef __RUBBERBAND_INCLUDED__
-#define __RUBBERBAND_INCLUDED__
+#ifndef PCB_RUBBERBAND_H
+#define PCB_RUBBERBAND_H
#include "global.h"
diff --git a/src/search.h b/src/search.h
index add5661..b6ddaa2 100644
--- a/src/search.h
+++ b/src/search.h
@@ -28,8 +28,8 @@
/* prototypes for search routines
*/
-#ifndef __SEARCH_INCLUDED__
-#define __SEARCH_INCLUDED__
+#ifndef PCB_SEARCH_H
+#define PCB_SEARCH_H
#include "global.h"
diff --git a/src/select.h b/src/select.h
index 0e12cc2..f3edde6 100644
--- a/src/select.h
+++ b/src/select.h
@@ -28,8 +28,8 @@
/* prototypes for select routines
*/
-#ifndef __SELECT_INCLUDED__
-#define __SELECT_INCLUDED__
+#ifndef PCB_SELECT_H
+#define PCB_SELECT_H
#include "global.h"
diff --git a/src/set.h b/src/set.h
index f8f6a9a..4985f9d 100644
--- a/src/set.h
+++ b/src/set.h
@@ -28,8 +28,8 @@
/* prototypes for update routines
*/
-#ifndef __UPDATE_INCLUDED__
-#define __UPDATE_INCLUDED__
+#ifndef PCB_SET_H
+#define PCB_SET_H
#include "global.h"
diff --git a/src/strflags.h b/src/strflags.h
index 241ba1b..da16b64 100644
--- a/src/strflags.h
+++ b/src/strflags.h
@@ -25,8 +25,8 @@
*
*/
-#ifndef _FLAGS_H_
-#define _FLAGS_H_
+#ifndef PCB_STRFLAGS_H
+#define PCB_STRFLAGS_H
/* The purpose of this interface is to make the file format able to
handle more than 32 flags, and to hide the internal details of
diff --git a/src/thermal.h b/src/thermal.h
index a2958d1..67c04e0 100644
--- a/src/thermal.h
+++ b/src/thermal.h
@@ -34,8 +34,8 @@
* operations, and the functions in thermal.h help implement that.
*/
-#ifndef __THERMAL_INCLUDED__
-#define __THERMAL_INCLUDED__
+#ifndef PCB_THERMAL_H
+#define PCH_THERMAL_H
#include <stdlib.h>
#include "global.h"
diff --git a/src/toporouter.h b/src/toporouter.h
index 0e98115..fcd0053 100644
--- a/src/toporouter.h
+++ b/src/toporouter.h
@@ -24,8 +24,8 @@
*
*/
-#ifndef __TOPOROUTER_INCLUDED__
-#define __TOPOROUTER_INCLUDED__
+#ifndef PCB_TOPOROUTER_H
+#define PCH_TOPOROUTER_H
#include <assert.h>
#include "data.h"
@@ -483,4 +483,4 @@ typedef struct {
#define FOREACH_END }} while(0)
-#endif /* __TOPOROUTER_INCLUDED__ */
+#endif /* PCB_TOPOROUTER_H */
diff --git a/src/undo.h b/src/undo.h
index 0a4601f..9b088ff 100644
--- a/src/undo.h
+++ b/src/undo.h
@@ -28,8 +28,8 @@
/* prototypes for undo routines
*/
-#ifndef __UNDO_INCLUDED__
-#define __UNDO_INCLUDED__
+#ifndef PCB_UNDO_H
+#define PCB_UNDO_H
#include "global.h"
diff --git a/src/vector.h b/src/vector.h
index 3eabef5..344118d 100644
--- a/src/vector.h
+++ b/src/vector.h
@@ -34,8 +34,8 @@
/* prototypes for vector routines.
*/
-#ifndef __VECTOR_INCLUDED__
-#define __VECTOR_INCLUDED__
+#ifndef PCB_VECTOR_H
+#define PCB_VECTOR_H
/* what a vector looks like */
typedef struct vector_struct vector_t;
@@ -78,4 +78,4 @@ vector_element_t vector_remove (vector_t * vector, int N);
vector_element_t vector_replace (vector_t * vector,
vector_element_t data, int N);
-#endif /* __VECTOR_INCLUDED__ */
+#endif /* PCB_VECTOR_H */
diff --git a/src/vendor.h b/src/vendor.h
index 3b4d2d4..aba4148 100644
--- a/src/vendor.h
+++ b/src/vendor.h
@@ -22,8 +22,8 @@
*
*/
-#ifndef __VENDOR_H__
-#define __VENDOR_H__
+#ifndef PCB_VENDOR_H
+#define PCB_VENDOR_H
int vendorDrillMap (int);
bool vendorIsElementMappable (ElementTypePtr);
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs