Minor syntactic sugar

src/R_magic.h

@@ -1,5 +1,5 @@
-#ifndef __R_MAGIC_H__
-#define __R_MAGIC_H__
+#ifndef H__R_MAGIC__
+#define H__R_MAGIC__
 
 #include <stdio.h>
 
@@ -26,7 +26,6 @@
 #define R_MAGIC_ASCII_VERSION16  1972
 
 int R_WriteMagic(FILE *fp, int number);
-
 int R_ReadMagic(FILE *fp);
 
-#endif // __R_MAGIC_H__
+#endif // H__R_MAGIC__

src/R_memory-object.h

@@ -1,21 +1,21 @@
-#ifndef __R_MEMORY_OBJECT_H__
-#define __R_MEMORY_OBJECT_H__
+#ifndef H__R_MEMORY_OBJECT__
+#define H__R_MEMORY_OBJECT__
 
 #include <Rinternals.h>
 
-struct rmemoryobject_t {
+struct r_memoryobject_t {
   char *buf;
-  size_t bufsz;
+  size_t buf_size;
   int magic;
 };
 
-int rdataToMemory(const char *filename, struct rmemoryobject_t *objMem);
-int memoryToRData(const char *filename, struct rmemoryobject_t objMem);
+int rdataToMemory(const char *filename, struct r_memoryobject_t *obj_mem);
+int memoryToRData(const char *filename, struct r_memoryobject_t obj_mem);
 
-SEXP memoryToRObject(struct rmemoryobject_t objMem);
-struct rmemoryobject_t *robjectToMemory(SEXP rObj, int magic);
+SEXP memoryToRObject(struct r_memoryobject_t obj_mem);
+struct r_memoryobject_t *robjectToMemory(SEXP r_obj, int magic);
 
 SEXP rdataToRObject(const char *filename);
-int robjectToRData(const char *filename, SEXP rObj, int magic);
+int robjectToRData(const char *filename, SEXP r_obj, int magic);
 
-#endif // __R_MEMORY_OBJECT_H__
+#endif // H__R_MEMORY_OBJECT__