Commit f11ec7ba authored by Anders Blomdell's avatar Anders Blomdell
Browse files

Guard macro unification/cleanup

parent 24cc29e9
......@@ -19,8 +19,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _LABCOMM_FD_READER_H_
#define _LABCOMM_FD_READER_H_
#ifndef __LABCOMM_FD_READER_H__
#define __LABCOMM_FD_READER_H__
#include "labcomm.h"
......
......@@ -19,8 +19,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _LABCOMM_FD_WRITER_H_
#define _LABCOMM_FD_WRITER_H_
#ifndef __LABCOMM_FD_WRITER_H__
#define __LABCOMM_FD_WRITER_H__
#include "labcomm.h"
......
......@@ -19,8 +19,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __LABCOMM_IOCTL_H__
#define __LABCOMM_IOCTL_H__
#ifndef __LABCOMM_IOCTL_H___
#define __LABCOMM_IOCTL_H___
#include "labcomm.h"
......
......@@ -20,8 +20,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _LABCOMM_PRIVATE_H_
#define _LABCOMM_PRIVATE_H_
#ifndef __LABCOMM_PRIVATE_H__
#define __LABCOMM_PRIVATE_H__
#ifdef LABCOMM_COMPAT
#include LABCOMM_COMPAT
......
......@@ -19,8 +19,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _LABCOMM_PTHREAD_SCHEDULER_H_
#define _LABCOMM_PTHREAD_SCHEDULER_H_
#ifndef __LABCOMM_PTHREAD_SCHEDULER_H__
#define __LABCOMM_PTHREAD_SCHEDULER_H__
#include "labcomm.h"
......
......@@ -19,8 +19,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _LABCOMM_SCHEDULER_H_
#define _LABCOMM_SCHEDULER_H_
#ifndef __LABCOMM_SCHEDULER_H__
#define __LABCOMM_SCHEDULER_H__
#ifdef LABCOMM_COMPAT
#include LABCOMM_COMPAT
......
......@@ -19,8 +19,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _LABCOMM_SCHEDULER_PRIVATE_H_
#define _LABCOMM_SCHEDULER_PRIVATE_H_
#ifndef __LABCOMM_SCHEDULER_PRIVATE_H__
#define __LABCOMM_SCHEDULER_PRIVATE_H__
#ifdef LABCOMM_COMPAT
#include LABCOMM_COMPAT
......
......@@ -9,7 +9,7 @@ class File:
def __init__(self, path, match, replacement):
def replace(s):
return re.sub('[ \t]+', ' ', s).replace(match, replacement)
return re.sub('[ \t]+', ' ', s).replace(match, replacement).strip()
self.name = path.replace(match, replacement)
self.path = path
with open(path) as f:
......@@ -50,7 +50,7 @@ if __name__ == '__main__':
else:
equal = True
for l in difflib.unified_diff(a.lines, b.lines, a.path, b.path):
print l,
print l
equal = False
if equal:
print "Identical", a.path, b.path
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment