Get rid of some warnings regarding header guards

opentracker.c

@@ -48,6 +48,7 @@ static char * g_serverdir;
 static char * g_serveruser;
 static unsigned int g_udp_workers;
 
+static void panic( const char *routing ) __attribute__ ((noreturn));
 static void panic( const char *routine ) {
   fprintf( stderr, "%s: %s\n", routine, strerror(errno) );
   exit( 111 );

ot_accesslist.h

@@ -3,8 +3,8 @@
 
    $id$ */
 
-#ifndef __OT_ACCESSLIST_H__
-#define __OT_ACCESSLIST_H__
+#ifndef OT_ACCESSLIST_H__
+#define OT_ACCESSLIST_H__
 
 #if defined ( WANT_ACCESSLIST_BLACK ) && defined (WANT_ACCESSLIST_WHITE )
 #  error WANT_ACCESSLIST_BLACK and WANT_ACCESSLIST_WHITE are exclusive.

ot_clean.h

@@ -3,8 +3,8 @@
 
    $id$ */
 
-#ifndef __OT_CLEAN_H__
-#define __OT_CLEAN_H__
+#ifndef OT_CLEAN_H__
+#define OT_CLEAN_H__
 
 /* The amount of time a clean cycle should take */
 #define OT_CLEAN_INTERVAL_MINUTES       2

ot_fullscrape.h

@@ -3,8 +3,8 @@
 
    $id$ */
 
-#ifndef __OT_FULLSCRAPE_H__
-#define __OT_FULLSCRAPE_H__
+#ifndef OT_FULLSCRAPE_H__
+#define OT_FULLSCRAPE_H__
 
 #ifdef WANT_FULLSCRAPE
 

ot_http.h

@@ -3,8 +3,8 @@
 
    $id$ */
 
-#ifndef __OT_HTTP_H__
-#define __OT_HTTP_H__
+#ifndef OT_HTTP_H__
+#define OT_HTTP_H__
 
 typedef enum {
   STRUCT_HTTP_FLAG_WAITINGFORTASK = 1,

ot_iovec.h

@@ -3,8 +3,8 @@
 
    $id$ */
 
-#ifndef __OT_IOVEC_H__
-#define __OT_IOVEC_H__
+#ifndef OT_IOVEC_H__
+#define OT_IOVEC_H__
 
 #include <sys/uio.h>
 

ot_livesync.h

@@ -3,8 +3,8 @@
 
  $id$ */
 
-#ifndef __OT_LIVESYNC_H__
-#define __OT_LIVESYNC_H__
+#ifndef OT_LIVESYNC_H__
+#define OT_LIVESYNC_H__
 
 #include "io.h"
 #include "trackerlogic.h"

ot_mutex.h

@@ -3,8 +3,8 @@
 
    $id$ */
 
-#ifndef __OT_MUTEX_H__
-#define __OT_MUTEX_H__
+#ifndef OT_MUTEX_H__
+#define OT_MUTEX_H__
 
 #include <sys/uio.h>
 

ot_rijndael.h

@@ -9,12 +9,14 @@
 
    $id$ */
 
-#ifndef __OT_RIJNDAEL_H__
-#define __OT_RIJNDAEL_H__
+#ifndef OT_RIJNDAEL_H__
+#define OT_RIJNDAEL_H__
 
 #include <stdint.h>
 
 int rijndaelKeySetupEnc128(uint32_t rk[44], const uint8_t cipherKey[] );
 void rijndaelEncrypt128(const uint32_t rk[44], const uint8_t pt[16], uint8_t ct[16]);
 
+extern const char *g_version_rijndael_c;
+
 #endif

ot_stats.h

@@ -3,8 +3,8 @@
 
    $id$ */
 
-#ifndef __OT_STATS_H__
-#define __OT_STATS_H__
+#ifndef OT_STATS_H__
+#define OT_STATS_H__
 
 typedef enum {
   EVENT_ACCEPT,
@@ -46,4 +46,7 @@ size_t stats_return_tracker_version( char *reply );
 void   stats_init( );
 void   stats_deinit( );
 
+extern const char *g_version_rijndael_c;
+extern const char *g_version_livesync_c;
+
 #endif

ot_sync.h

@@ -3,8 +3,8 @@
 
    $id$ */
 
-#ifndef __OT_SYNC_H__
-#define __OT_SYNC_H__
+#ifndef OT_SYNC_H__
+#define OT_SYNC_H__
 
 #ifdef WANT_SYNC_BATCH
 enum { SYNC_IN, SYNC_OUT };

ot_udp.h

@@ -3,8 +3,8 @@
 
    $id$ */
 
-#ifndef __OT_UDP_H__
-#define __OT_UDP_H__
+#ifndef OT_UDP_H__
+#define OT_UDP_H__
 
 void udp_init( int64 sock, unsigned int worker_count );
 int  handle_udp6( int64 serversocket, struct ot_workstruct *ws );

ot_vector.h

@@ -3,8 +3,8 @@
 
    $id$ */
 
-#ifndef __OT_VECTOR_H__
-#define __OT_VECTOR_H__
+#ifndef OT_VECTOR_H__
+#define OT_VECTOR_H__
 
 /* These defines control vectors behaviour */
 #define OT_VECTOR_MIN_MEMBERS   2

scan_urlencoded_query.h

@@ -3,8 +3,8 @@
 
    $id$ */
 
-#ifndef __SCAN_URLENCODED_QUERY_H__
-#define __SCAN_URLENCODED_QUERY_H__
+#ifndef SCAN_URLENCODED_QUERY_H__
+#define SCAN_URLENCODED_QUERY_H__
 
 #include <sys/types.h>
 

trackerlogic.h

@@ -3,8 +3,8 @@
 
    $id$ */
 
-#ifndef __OT_TRACKERLOGIC_H__
-#define __OT_TRACKERLOGIC_H__
+#ifndef OT_TRACKERLOGIC_H__
+#define OT_TRACKERLOGIC_H__
 
 #include <sys/types.h>
 #include <sys/time.h>